[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. dcef300aaa
|
From: |
Marek Aaron Sapota |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. dcef300aaa5c994c08554001464a1630ca117081 |
|
Date: |
Sun, 30 Aug 2009 19:54:14 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via dcef300aaa5c994c08554001464a1630ca117081 (commit)
from 1357e42c30c239a6f1e3fc1b93e5c2eaf8e3f016 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dcef300aaa5c994c08554001464a1630ca117081
Author: Marek Aaron Sapota <address@hidden>
Date: Sun Aug 30 21:53:43 2009 +0200
GUI was moved to src.
diff --git a/misc/PyGTK_Control/MyServerControl.py
b/misc/PyGTK_Control/MyServerControl.py
deleted file mode 100644
index faf314b..0000000
--- a/misc/PyGTK_Control/MyServerControl.py
+++ /dev/null
@@ -1,461 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from __future__ import print_function
-import gtk
-import gtk.glade
-import gobject
-from MyServer.pycontrollib.config import MyServerConfig
-from MyServer.pycontrollib.mimetypes import MIMETypes
-from MyServer.pycontrollib.controller import Controller
-from MyServer.pycontrollib.vhost import VHosts
-from MyServer.GUI import GUIConfig
-from MyServer.GUI.AboutWindow import About
-from MyServer.GUI.ConnectionWindow import Connection
-from MyServer.GUI.DefinitionWidgets import DefinitionTable, DefinitionTreeView
-from MyServer.GUI.MIMEWidgets import MimeTable, MimeTreeView
-from MyServer.GUI.VHostWidgets import VHostTable, VHostTreeView
-from MyServer.GUI.BrowserWidgets import BrowserTable
-from MyServer.GUI.SecurityWidgets import SecurityTable
-
-class PyGTKControl():
- '''GNU MyServer Control main window.'''
-
- def __init__(self):
- self.gladefile = 'PyGTKControl.glade'
- self.widgets = gtk.glade.XML(self.gladefile, 'window')
- self.widgets.signal_autoconnect(self)
- self.construct_options()
- self.construct_mime()
- self.construct_vhosts()
- self.construct_browser()
- self.chooser = None # Active file chooser
- # path of currently edited files
- self.config_path = self.mime_path = self.vhost_path = None
- # remembered unhandled parts of configs
- self.config_custom = []
- self.mime_custom = []
- self.vhost_custom = []
- self.mime_custom_attrib = {}
- self.vhost_custom_attrib = {}
- self.controller = None
-
- def on_window_destroy(self, widget):
- '''Exits program.'''
- gtk.main_quit()
-
- def on_quit_menu_item_activate(self, widget):
- '''Exits program.'''
- gtk.main_quit()
-
- def on_about_menu_item_activate(self, widget):
- '''Shows about window.'''
- About()
-
- def on_connect_menu_item_activate(self, widget):
- '''Show connection dialog.'''
- dialog = Connection()
- def connect(widget):
- self.controller = Controller(
- dialog.get_host(), dialog.get_port(),
- dialog.get_username(), dialog.get_password())
- self.controller.connect()
- dialog.destroy()
- dialog.widgets.get_widget('ok_button').connect('clicked', connect)
- dialog.widgets.get_widget('connectiondialog').show()
-
- def on_disconnect_menu_item_activate(self, widget):
- '''Disconnect from server.'''
- if self.controller is not None:
- self.controller.disconnect()
- self.controller = None
-
- def on_get_config_menu_item_activate(self, widget):
- '''Get server config from remote server.'''
- if self.controller is not None:
- self.set_up_config(self.controller.get_server_configuration())
-
- def on_get_mime_menu_item_activate(self, widget):
- '''Get MIME config from remote server.'''
- if self.controller is not None:
- self.set_up_mime(self.controller.get_MIME_type_configuration())
-
- def on_get_vhost_menu_item_activate(self, widget):
- '''Get VHost config from remote server.'''
- if self.controller is not None:
- self.set_up_vhost(self.controller.get_vhost_configuration())
-
- def on_put_config_menu_item_activate(self, widget):
- '''Put server config on remote server.'''
- if self.controller is not None:
- self.controller.put_server_configuration(self.get_current_config())
-
- def on_put_mime_menu_item_activate(self, widget):
- '''Put MIME config on remote server.'''
- if self.controller is not None:
-
self.controller.put_MIME_type_configuration(self.get_current_mime())
-
- def on_put_vhost_menu_item_activate(self, widget):
- '''Put VHost config on remote server.'''
- if self.controller is not None:
- self.controller.put_vhost_configuration(self.get_vhost_config())
-
- def on_new_config_menu_item_activate(self, widget = None):
- '''Clears server configuration.'''
- if widget is not None:
- self.config_path = None
- self.config_custom = []
- table, tree = self.tabs['unknown']
- tree.get_model().clear()
- for tab in self.tabs:
- table, tree = self.tabs[tab]
- table.clear()
- tree.make_clear()
-
- def on_new_mime_menu_item_activate(self, widget = None):
- '''Clears MIME configuration.'''
- if widget is not None:
- self.mime_path = None
- self.mime_custom = []
- self.mime_custom_attrib = {}
- table, tree = self.mime_tab[0]
- table.clear()
- tree.get_model().clear()
-
- def on_new_vhost_menu_item_activate(self, widget = None):
- '''Clears VHost configuration.'''
- if widget is not None:
- self.vhost_path = None
- self.vhost_custom = []
- self.vhost_custom_attrib = {}
- table, tree = self.vhost_tab
- table.clear()
- tree.get_model().clear()
-
- def generic_open(self, dialog, path, config_type, set_up_method):
- '''Open configuration file.'''
- if self.chooser is not None:
- self.chooser.destroy()
- self.chooser = gtk.FileChooserDialog(
- dialog,
- buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
- gtk.STOCK_OPEN, gtk.RESPONSE_OK))
- def handle_response(widget, response):
- if response == gtk.RESPONSE_OK:
- setattr(self, path, self.chooser.get_filename())
- with open(getattr(self, path)) as f:
- conf = config_type.from_string(f.read())
- set_up_method(conf)
- self.chooser.destroy()
- self.chooser.connect('response', handle_response)
- self.chooser.show()
-
- def on_open_config_menu_item_activate(self, widget):
- '''Open local server configuration file.'''
- self.generic_open(
- 'Open server configuration file.', 'config_path',
- MyServerConfig, self.set_up_config)
-
- def on_open_mime_menu_item_activate(self, widget):
- '''Open local MIME configuration file.'''
- self.generic_open(
- 'Open MIME configuration file.', 'mime_path',
- MIMETypes, self.set_up_mime)
-
- def on_open_vhost_menu_item_activate(self, widget):
- '''Open local VHost configuration file.'''
- self.generic_open(
- 'Open VHost configuration file.', 'vhost_path',
- VHosts, self.set_up_vhost)
-
- def generic_save_as(self, dialog, widget, path, save_method):
- '''Save configuration as file.'''
- if self.chooser is not None:
- self.chooser.destroy()
- self.chooser = gtk.FileChooserDialog(
- dialog,
- action = gtk.FILE_CHOOSER_ACTION_SAVE,
- buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
- gtk.STOCK_SAVE_AS, gtk.RESPONSE_OK))
- def handle_response(widget, response):
- if response == gtk.RESPONSE_OK:
- setattr(self, path, self.chooser.get_filename())
- save_method(widget)
- self.chooser.destroy()
- self.chooser.connect('response', handle_response)
- self.chooser.show()
-
- def on_save_as_config_menu_item_activate(self, widget):
- '''Save server configuration as local file.'''
- self.generic_save_as(
- 'Save server configuration file.',
- widget, 'config_path',
- self.on_save_config_menu_item_activate)
-
- def on_save_as_mime_menu_item_activate(self, widget):
- '''Save MIME configuration as local file.'''
- self.generic_save_as(
- 'Save MIME configuration file.',
- widget, 'mime_path',
- self.on_save_mime_menu_item_activate)
-
- def on_save_as_vhost_menu_item_activate(self, widget):
- '''Save VHost configuration as local file.'''
- self.generic_save_as(
- 'Save VHost configuration file.',
- widget, 'vhost_path',
- self.on_save_vhost_menu_item_activate)
-
- def generic_save(self, widget, path, save_as_method, config_method):
- '''Save configuration file.'''
- if getattr(self, path) is None:
- save_as_method(widget)
- else:
- config = config_method()
- with open(getattr(self, path), 'w') as f:
- f.write(str(config))
-
- def on_save_config_menu_item_activate(self, widget):
- '''Save server configuration to file.'''
- self.generic_save(
- widget, 'config_path',
- self.on_save_as_config_menu_item_activate,
- self.get_current_config)
-
- def on_save_mime_menu_item_activate(self, widget):
- '''Save MIME configuration to file.'''
- self.generic_save(
- widget, 'mime_path',
- self.on_save_as_mime_menu_item_activate,
- self.get_current_mime)
-
- def on_save_vhost_menu_item_activate(self, widget):
- '''Save VHost configuration to file.'''
- self.generic_save(
- widget, 'vhost_path',
- self.on_save_as_vhost_menu_item_activate,
- self.get_current_vhost)
-
- def get_current_config(self):
- '''Returns current server configuration as MyServerConfig instance.'''
- definitions = []
- for tab in self.tabs:
- table, tree = self.tabs[tab]
- definitions += table.make_def(tree)
- config = MyServerConfig(definitions)
- config.definitions.custom = self.config_custom
- return config
-
- def get_current_mime(self):
- '''Returns current MIME configuration as MIMETypes instance.'''
- table, tree = self.mime_tab[0]
- mimes = table.make_def(tree)
- config = MIMETypes(mimes)
- config.custom = self.mime_custom
- config.custom_attrib = self.mime_custom_attrib
- return config
-
- def get_current_vhost(self):
- '''Returns current VHost configuration as VHosts instance.'''
- table, tree = self.vhost_tab
- vhosts = table.make_def(tree)
- config = VHosts(vhosts)
- config.custom = self.vhost_custom
- config.custom_attrib = self.vhost_custom_attrib
- return config
-
- def on_add_unknown_definition_menu_item_activate(self, widget):
- '''Adds a new definition to unknown tab.'''
- table, tree = self.tabs['unknown']
- tree.get_model().append(None, ('', '', False, True, '', False, {}, ))
-
- def on_add_mime_type_menu_item_activate(self, widget):
- '''Adds a new MIME type.'''
- table, tree = self.mime_tab[0]
- mime_lists = {}
- for mime_list in GUIConfig.mime_lists:
- mime_lists[mime_list] = []
- tree.get_model().append(('', {}, mime_lists, [], [], {}, ))
-
- def on_remove_mime_type_menu_item_activate(self, widget):
- '''Removes selected MIME type.'''
- table, tree = self.mime_tab[0]
- table.remove_current(tree)
-
- def on_add_vhost_menu_item_activate(self, widget):
- '''Adds a new VHost.'''
- table, tree = self.vhost_tab
- vhost_lists = {}
- for vhost_list in GUIConfig.vhost_lists:
- vhost_lists[vhost_list[0]] = []
- tree.get_model().append(('', {}, vhost_lists, [], [], {}, ))
-
- def on_remove_vhost_menu_item_activate(self, widget):
- '''Removes selected VHost.'''
- table, tree = self.vhost_tab
- table.remove_current(tree)
-
- def on_add_definition_to_mime_menu_item_activate(self, widget):
- '''Adds a definition to currently selected MIME type.'''
- table, tree = self.mime_tab[1]
- tree.get_model().append(None, ('', '', False, True, '', False, {}, ))
-
- def on_add_log_to_vhost_menu_item_activate(self, widget):
- '''Adds a log to currently selected VHost.'''
- table, tree = self.vhost_tab
- table.add_log()
-
- def on_remove_log_from_vhost_menu_item_activate(self, widget):
- '''Removes selected log from currently selected VHost.'''
- table, tree = self.vhost_tab
- table.remove_log()
-
- def set_up_config(self, config):
- '''Reads server configuration from given config instance.'''
- self.on_new_config_menu_item_activate()
- self.config_custom = config.definitions.custom
- tabs = {}
- for tab in self.tabs:
- tabs[tab] = []
- for definition in config.get_definitions():
- name = definition.get_name()
- tab_name = self.options[name] if name in self.options else
'unknown'
- tabs[tab_name].append(definition)
-
- for tab in tabs:
- tree = self.tabs[tab][1]
- tree.set_up(tabs[tab], tab != 'unknown')
-
- def set_up_mime(self, config):
- '''Reads MIME configuration from given config instance.'''
- self.on_new_mime_menu_item_activate()
- self.mime_custom = config.custom
- self.mime_custom_attrib = config.custom_attrib
- tree = self.mime_tab[0][1]
- tree.set_up(config.MIME_types)
-
- def set_up_vhost(self, config):
- '''Reads VHost configuration from given config instance.'''
- self.on_new_vhost_menu_item_activate()
- self.vhost_custom = config.custom
- self.vhost_custom_attrib = config.custom_attrib
- tree = self.vhost_tab[1]
- tree.set_up(config.VHosts)
-
- def construct_options(self):
- '''Reads known options from file and prepares GUI.'''
-
- # segregate options by tab
- segregated_options = {} # tab name => option names
- self.options = {} # option name => tab name
- for option in GUIConfig.options:
- tab = 'other'
- for prefix in GUIConfig.tabs:
- if option.startswith(prefix):
- tab = prefix
- break
- if not segregated_options.has_key(tab):
- segregated_options[tab] = []
- segregated_options[tab].append(option)
- self.options[option] = tab
-
- self.tabs = {} # tab name => (table, tree, )
- for tab in GUIConfig.tabs + ['other', 'unknown']:
- options = segregated_options.get(tab, [])
- panels = gtk.HPaned()
-
- tree = DefinitionTreeView()
- tree_model = tree.get_model()
- panels.pack1(tree.scroll, True, False)
- table = DefinitionTable(tree)
- panels.pack2(table, False, False)
-
- self.tabs[tab] = (table, tree, )
-
- for option in options:
- tooltip_text, var = GUIConfig.options[option]
- # all but first three columns will be set to defaults later by
- # on_new_menu_item_activate
- tree_model.append(None, (option, tooltip_text, True, False, '',
- False, {}, ))
-
- self.widgets.get_widget('notebook').append_page(
- panels, gtk.Label(tab))
-
- self.on_new_config_menu_item_activate()
- self.widgets.get_widget('notebook').show_all()
-
- def construct_mime(self):
- '''Reads mime options from file and prepares GUI.'''
- vpanels = gtk.VPaned()
-
- panels = gtk.HPaned()
- def_tree = DefinitionTreeView()
- panels.pack1(def_tree.scroll, True, False)
- def_table = DefinitionTable(def_tree)
- panels.pack2(def_table, False, False)
-
- vpanels.pack2(panels)
-
- panels = gtk.HPaned()
- tree = MimeTreeView()
- panels.pack1(tree.scroll, True, False)
- table = MimeTable(tree, def_tree, def_table)
- panels.pack2(table, False, False)
-
- vpanels.pack1(panels)
-
- self.mime_tab = ((table, tree, ), (def_table, def_tree), )
- self.widgets.get_widget('notebook').append_page(
- vpanels, gtk.Label('MIME Type'))
-
- self.widgets.get_widget('notebook').show_all()
-
- def construct_vhosts(self):
- '''Reads vhost options from file and prepares GUI.'''
- panels = gtk.HPaned()
- tree = VHostTreeView()
- panels.pack1(tree.scroll, True, False)
- table = VHostTable(tree)
- panels.pack2(table.scroll, True, False)
-
- self.vhost_tab = (table, tree, )
- self.widgets.get_widget('notebook').append_page(
- panels, gtk.Label('VHosts'))
-
- self.widgets.get_widget('notebook').show_all()
-
- def construct_browser(self):
- '''Constructs file browser.'''
- panels = gtk.HPaned()
- self.security_table = SecurityTable()
- panels.pack2(self.security_table, True, False)
- self.browser_table = BrowserTable(self.security_table.read_from_file)
- panels.pack1(self.browser_table, True, False)
-
- self.widgets.get_widget('notebook').append_page(
- panels, gtk.Label('File browser'))
-
- self.widgets.get_widget('notebook').show_all()
-
- def on_save_security_menu_item_activate(self, widget):
- self.security_table.write_to_file(
- self.browser_table.browser_tree.browser)
-
-PyGTKControl()
-gtk.main()
diff --git a/misc/PyGTK_Control/PyGTKControl.glade
b/misc/PyGTK_Control/PyGTKControl.glade
deleted file mode 100644
index 88af294..0000000
--- a/misc/PyGTK_Control/PyGTKControl.glade
+++ /dev/null
@@ -1,1436 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.16 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="window">
- <property name="visible">True</property>
- <signal name="destroy" handler="on_window_destroy"/>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkMenuBar" id="menubar">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem" id="file_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="file_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem" id="new_menu_item">
- <property name="label">New</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="new_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="new_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_new_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="new_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_new_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="new_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_new_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="new_image">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="open_menu_item">
- <property name="label">Open</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="open_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="open_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_open_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="open_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_open_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="open_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_open_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="open_image">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="save_menu_item">
- <property name="label">Save</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="save_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="save_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="save_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="save_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="save_image">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="save_as_menu_item">
- <property name="label">Save as</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="save_as_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="save_as_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_as_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="save_as_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_as_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="save_as_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Save
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_save_as_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="save_as_image">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator1">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="quit_menu_item">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="on_quit_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="remote_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Remote</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="remote_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem" id="connect_menu_item">
- <property name="label">gtk-connect</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="on_connect_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="disconnect_menu_item">
- <property name="label">gtk-disconnect</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="on_disconnect_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="get_menu_item">
- <property name="label">Get</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="get_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="get_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Get
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_get_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="get_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Get
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_get_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="get_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Get
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_get_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="get_image">
- <property name="visible">True</property>
- <property name="stock">gtk-go-down</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="put_menu_item">
- <property name="label">Put</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="put_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem"
id="put_config_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Put
server configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_put_config_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="put_mime_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Put
MIME configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_put_mime_menu_item_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem"
id="put_vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Put
VHost configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_put_vhost_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="put_image">
- <property name="visible">True</property>
- <property name="stock">gtk-redo</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="definitions_menu_item">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Definitions</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="definitions_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem"
id="add_unknown_definition_menu_item">
- <property name="label">Add unknown
definition</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_add_unknown_definition_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage"
id="add_unknown_definition_image">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="mime_types_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_MIME
Types</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="mime_types_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem"
id="add_mime_type_menu_item">
- <property name="label">Add MIME type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_add_mime_type_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="add_mime_type_image">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="remove_mime_type_menu_item">
- <property name="label">Remove MIME type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_remove_mime_type_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="remove_mime_type_image">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="add_definition_to_mime_menu_item">
- <property name="label">Add definition to MIME
type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_add_definition_to_mime_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage"
id="add_definition_to_mime_image">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="vhost_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_VHosts</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="vhost_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem"
id="add_vhost_menu_item">
- <property name="label">Add VHost</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_add_vhost_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="add_vhost_image">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="remove_vhost_menu_item">
- <property name="label">Remove VHost</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_remove_vhost_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="remove_vhost_image">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="add_log_to_vhost_menu_item">
- <property name="label">Add log to VHost</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_add_log_to_vhost_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="add_log_to_vhost_image">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem"
id="remove_log_from_vhost_menu_item">
- <property name="label">Remove log from VHost</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_remove_log_from_vhost_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage"
id="remove_log_from_vhost_image">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="security_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Security</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="security_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem"
id="save_security_menu_item">
- <property name="label">Save security</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate"
handler="on_save_security_menu_item_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="save_security_image">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="help_menu_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="help_menu">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem" id="about_menu_item">
- <property name="label">gtk-about</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="on_about_menu_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook" id="notebook">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkStatusbar" id="statusbar">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkAboutDialog" id="aboutdialog">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <property name="program_name">GNU MyServer Control</property>
- <property name="version">v0.9</property>
- <property name="copyright" translatable="yes">Copyright (C) 2009 Free
Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.</property>
- <property name="website">http://www.gnu.org/software/myserver/</property>
- <property name="license"> GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it
does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-</property>
- <signal name="response" handler="on_aboutdialog_response"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <placeholder/>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="connectiondialog">
- <property name="border_width">5</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkTable" id="table">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkLabel" id="host_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">host</property>
- </widget>
- <packing>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="port_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">port</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="username_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">username</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="password_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">password</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="host_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="port_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_cancel_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="ok_button">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_ok_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
diff --git a/misc/py_control_client/INSTALL b/misc/py_control_client/INSTALL
deleted file mode 100644
index 84a158d..0000000
--- a/misc/py_control_client/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-To install MyServer python control libraries run:
-
-$ python setup.py install
-
-or
-
-$ python setup.py install --prefix=/custom/path
-
-To generate tar.gz package with this libraries run:
-
-$ python setup.py sdist
diff --git a/misc/py_control_client/MyServer/GUI/AboutWindow.py
b/misc/py_control_client/MyServer/GUI/AboutWindow.py
deleted file mode 100644
index 252081f..0000000
--- a/misc/py_control_client/MyServer/GUI/AboutWindow.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gtk.glade
-
-class About():
- '''GNU MyServer Control about window.'''
-
- def __init__(self):
- self.gladefile = 'PyGTKControl.glade'
- self.widgets = gtk.glade.XML(self.gladefile, 'aboutdialog')
- self.widgets.signal_autoconnect(self)
-
- def on_aboutdialog_response(self, widget, response):
- widget.destroy()
diff --git a/misc/py_control_client/MyServer/GUI/BrowserWidgets.py
b/misc/py_control_client/MyServer/GUI/BrowserWidgets.py
deleted file mode 100644
index 219ef16..0000000
--- a/misc/py_control_client/MyServer/GUI/BrowserWidgets.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-from gtk import gdk
-import gobject
-from MyServer.pycontrollib.browser import LocalFileBrowser
-
-class BrowserTreeView(gtk.TreeView):
- def __init__(self, callback):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gdk.Pixbuf,
- gobject.TYPE_STRING))
- self.callback = callback
- self.model = self.get_model()
- renderer = gtk.CellRendererPixbuf()
- column = gtk.TreeViewColumn()
- column.pack_start(renderer)
- column.add_attribute(renderer, 'pixbuf', 0)
- self.append_column(column)
- renderer = gtk.CellRendererText()
- column = gtk.TreeViewColumn('File')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 1)
- self.append_column(column)
-
- self.browser = LocalFileBrowser()
- self.browser.show_hidden(False)
- icon_theme = gtk.icon_theme_get_default()
- self.dir_icon = icon_theme.load_icon('gtk-directory', 16, 0)
- self.update()
- self.connect('row-activated', self.change_dir)
- callback(self.browser)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- def update(self):
- '''Show contents of current directory.'''
- self.model.clear()
- for d in self.browser.list_dir():
- self.model.append((self.dir_icon, d, ))
-
- def change_dir(self, widget, path, view_column):
- self.browser.change_dir(self.model[path][1])
- self.update()
- self.callback(self.browser)
-
-class BrowserTable(gtk.Table):
- def __init__(self, callback):
- gtk.Table.__init__(self, 2, 1)
-
- self.browser_tree = BrowserTreeView(callback)
-
- def set_show_hidden(button):
- self.browser_tree.browser.show_hidden(button.get_active())
- self.browser_tree.update()
- hide_check = gtk.CheckButton('Show hidden directories.')
- hide_check.connect('toggled', set_show_hidden)
-
- self.attach(hide_check, 0, 1, 0, 1, yoptions = gtk.FILL)
- self.attach(self.browser_tree.scroll, 0, 1, 1, 2)
diff --git a/misc/py_control_client/MyServer/GUI/ConnectionWindow.py
b/misc/py_control_client/MyServer/GUI/ConnectionWindow.py
deleted file mode 100644
index 16d4ddf..0000000
--- a/misc/py_control_client/MyServer/GUI/ConnectionWindow.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gtk.glade
-
-class Connection():
- def __init__(self):
- self.gladefile = 'PyGTKControl.glade'
- self.widgets = gtk.glade.XML(self.gladefile, 'connectiondialog')
- self.widgets.signal_autoconnect(self)
-
- def destroy(self):
- '''Destroys this widget.'''
- self.widgets.get_widget('connectiondialog').destroy()
-
- def on_cancel_button_clicked(self, widget):
- self.destroy()
-
- def get_host(self):
- return self.widgets.get_widget('host_entry').get_text()
-
- def get_port(self):
- return self.widgets.get_widget('port_entry').get_text()
-
- def get_username(self):
- return self.widgets.get_widget('username_entry').get_text()
-
- def get_password(self):
- return self.widgets.get_widget('password_entry').get_text()
diff --git a/misc/py_control_client/MyServer/GUI/DefinitionWidgets.py
b/misc/py_control_client/MyServer/GUI/DefinitionWidgets.py
deleted file mode 100644
index 079dbee..0000000
--- a/misc/py_control_client/MyServer/GUI/DefinitionWidgets.py
+++ /dev/null
@@ -1,304 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gobject
-from MyServer.pycontrollib.definition import DefinitionElement, DefinitionTree
-
-class DefinitionTable(gtk.Table):
- def __init__(self, tree):
- gtk.Table.__init__(self, 7, 3)
-
- tree.connect('cursor-changed', self.cursor_changed)
- self.last_selected = None
-
- enabled_label = gtk.Label('enabled:')
- self.enabled_field = enabled_checkbutton = gtk.CheckButton()
- enabled_checkbutton.set_tooltip_text('If not active, definition won\'t
be included in saved configuration.')
- self.attach(enabled_label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
- self.attach(enabled_checkbutton, 1, 3, 0, 1, yoptions = gtk.FILL)
-
- value_label = gtk.Label('value:')
- self.value_field = value_entry = gtk.Entry()
- self.value_check_field = value_checkbutton = gtk.CheckButton()
- value_checkbutton.set_tooltip_text('If not active value won\'t be
saved in configuration.')
- value_checkbutton.set_active(True)
-
- self.attach(value_label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.attach(value_entry, 1, 2, 1, 2, yoptions = gtk.FILL)
- self.attach(value_checkbutton, 2, 3, 1, 2, gtk.FILL, gtk.FILL)
-
- add_definition_button = gtk.Button('add sub-definition')
- def add_sub_definition(button):
- model, selected = tree.get_selection().get_selected()
- if selected is not None:
- model.append(selected, ('', '', False, True, '', False, {}, ))
- self.value_check_field.set_active(False) # auto disable value
- add_definition_button.connect('clicked', add_sub_definition)
- self.attach(add_definition_button, 0, 3, 2, 3, yoptions = gtk.FILL)
-
- remove_definition_button = gtk.Button('remove this definition')
- def remove_definition(button):
- model, selected = tree.get_selection().get_selected()
- if selected is not None and not model[selected][2]:
- model.remove(selected)
- self.clear()
- remove_definition_button.connect('clicked', remove_definition)
- self.attach(remove_definition_button, 0, 3, 3, 4, yoptions = gtk.FILL)
-
- add_attribute_button = gtk.Button('add attribute')
- remove_attribute_button = gtk.Button('remove attribute')
- button_table = gtk.Table(1, 2)
- add_attribute_button.connect(
- 'clicked',
- lambda button: attributes_model.append(('', '', )))
- def remove_attribute(button):
- model, selected = attributes_list.get_selection().get_selected()
- if selected is not None:
- model.remove(selected)
- remove_attribute_button.connect('clicked', remove_attribute)
- button_table.attach(add_attribute_button, 0, 1, 0, 1)
- button_table.attach(remove_attribute_button, 1, 2, 0, 1)
- self.attach(button_table, 0, 3, 4, 5, yoptions = gtk.FILL)
-
- attributes_label = gtk.Label('attributes:')
- attributes_list = gtk.TreeView(gtk.ListStore(gobject.TYPE_STRING,
- gobject.TYPE_STRING))
- attributes_scroll = gtk.ScrolledWindow()
- attributes_scroll.set_policy(gtk.POLICY_AUTOMATIC,
gtk.POLICY_AUTOMATIC)
- attributes_scroll.set_shadow_type(gtk.SHADOW_OUT)
- attributes_scroll.set_border_width(5)
- attributes_scroll.add(attributes_list)
- self.attributes_field = attributes_model = attributes_list.get_model()
-
- def edited_handler(cell, path, text, data):
- model, col = data
- model[path][col] = text
- variable_column = gtk.TreeViewColumn('variable')
- variable_renderer = gtk.CellRendererText()
- variable_renderer.set_property('editable', True)
- variable_renderer.connect('edited', edited_handler,
- (attributes_model, 0, ))
- variable_column.pack_start(variable_renderer)
- variable_column.add_attribute(variable_renderer, 'text', 0)
-
- value_column = gtk.TreeViewColumn('value')
- value_renderer = gtk.CellRendererText()
- value_renderer.set_property('editable', True)
- value_renderer.connect('edited', edited_handler,
- (attributes_model, 1, ))
- value_column.pack_start(value_renderer)
- value_column.add_attribute(value_renderer, 'text', 1)
-
- attributes_list.append_column(variable_column)
- attributes_list.append_column(value_column)
- self.attach(attributes_label, 0, 3, 5, 6, yoptions = gtk.FILL)
- self.attach(attributes_scroll, 0, 3, 6, 7)
-
- def clear(self):
- '''Clear input widgets.'''
- self.enabled_field.set_active(False)
- self.value_field.set_text('')
- self.value_check_field.set_active(False)
- self.attributes_field.clear()
- self.last_selected = None
-
- def save_changed(self, tree):
- '''Save data from input widgets to tree.'''
- if self.last_selected is not None:
- attributes = {}
- i = self.attributes_field.iter_children(None)
- while i is not None: # iterate over attributes
- attributes[self.attributes_field.get_value(i, 0)] = \
- self.attributes_field.get_value(i, 1)
- i = self.attributes_field.iter_next(i)
- row = tree.get_model()[self.last_selected]
- row[3] = self.enabled_field.get_active()
- row[4] = self.value_field.get_text()
- row[5] = self.value_check_field.get_active()
- row[6] = attributes
-
- def cursor_changed(self, tree):
- '''Save data, and display data of current selected row.'''
- self.save_changed(tree)
-
- self.clear()
-
- self.last_selected = current = self.get_selected(tree)
- row = tree.get_model()[current]
- self.enabled_field.set_active(row[3])
- self.value_field.set_text(row[4])
- self.value_check_field.set_active(row[5])
- for attribute in row[6]:
- self.attributes_field.append((attribute, row[6][attribute], ))
-
- def get_selected(self, tree):
- '''Get iterator of currently selected row.'''
- model, selected = tree.get_selection().get_selected()
- return selected
-
- def make_def(self, tree):
- '''Export all data as list of definitions.'''
- self.save_changed(tree)
- model = tree.get_model()
- definitions = []
- i = model.iter_children(None)
- while i is not None: # iterate over options
- definition = tree.make_def(i)
- if definition is not None:
- definitions.append(definition)
- i = model.iter_next(i)
- return definitions
-
-class DefinitionTreeView(gtk.TreeView):
- def __init__(self):
- gtk.TreeView.__init__(self, gtk.TreeStore(
- gobject.TYPE_STRING, # option name
- gobject.TYPE_STRING, # option tooltip
- gobject.TYPE_BOOLEAN, # True if option is known
- gobject.TYPE_BOOLEAN, # enabled
- gobject.TYPE_STRING, # value
- gobject.TYPE_BOOLEAN, # value_check
- gobject.TYPE_PYOBJECT)) # attributes dict
- model = self.get_model()
- def name_edited_handler(cell, path, text, data):
- model = data
- row = model[path]
- if not row[2]: # don't edit names of known options
- row[0] = text
- name_renderer = gtk.CellRendererText()
- name_renderer.set_property('editable', True)
- name_renderer.connect('edited', name_edited_handler, model)
- name_column = gtk.TreeViewColumn('name')
- name_column.pack_start(name_renderer)
- name_column.add_attribute(name_renderer, 'text', 0)
- self.append_column(name_column)
- value_renderer = gtk.CellRendererText()
- value_column = gtk.TreeViewColumn('value')
- value_column.pack_start(value_renderer)
- value_column.add_attribute(value_renderer, 'text', 4)
- self.append_column(value_column)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- def show_tooltip(widget, x, y, keyboard_tip, tooltip):
- if not widget.get_tooltip_context(x, y, keyboard_tip):
- return False
- else:
- model, path, it = widget.get_tooltip_context(x, y,
keyboard_tip)
- tooltip.set_text(model[it][1])
- widget.set_tooltip_row(tooltip, path)
- return True
- self.props.has_tooltip = True
- self.connect("query-tooltip", show_tooltip)
-
- def make_def(self, current):
- '''Return row pointed by current exported as definition.'''
- model = self.get_model()
- row = model[current]
- name = row[0]
- enabled = row[3]
- value = row[4]
- value_check = row[5]
- attributes = row[6]
- if value_check:
- attributes['value'] = value
- if not enabled:
- return None
- i = model.iter_children(current)
- if i is None:
- return DefinitionElement(name, attributes)
- else:
- definitions = []
- while i is not None: # iterate over children
- definition = self.make_def(i)
- if definition is not None:
- definitions.append(definition)
- i = model.iter_next(i)
- return DefinitionTree(name, definitions, attributes)
-
- def make_clear(self):
- '''Remove all sub-definitions, reset values of level-1 definitions.'''
- model = self.get_model()
- self.get_selection().unselect_all()
- i = model.iter_children(None)
- while i is not None: # iterate over options
- row = model[i]
- row[3] = False
- row[4] = ''
- row[5] = False
- row[6] = {}
- child = model.iter_children(i)
- if child is not None: # remove node children
- while model.remove(child):
- pass
- i = model.iter_next(i)
-
- def set_up(self, definitions, search):
- '''Sets up model reading from given definition list. If search is True
- will substitute alreaty present model data, if it is false will append
- all the definitions.'''
-
- def get_value_and_attributes(definition):
- '''Get column values from definition instance.'''
- name = definition.get_name()
- enabled = True
- try:
- value = definition.get_attribute('value')
- value_check = True
- except KeyError:
- value = ''
- value_check = False
- attributes = definition.get_attributes()
- attributes.pop('value', None)
- return (name, enabled, value, value_check, attributes, )
-
- def add_children(parent, definition):
- '''Insert sub-definitions of given definition as children of given
- parent tree iterator.'''
- if isinstance(definition, DefinitionTree):
- for d in definition.get_definitions():
- name, enabled, value, value_check, attributes = \
- get_value_and_attributes(d)
- i = self.get_model().append(
- parent,
- (name, '', False, enabled, value, value_check,
- attributes, ))
- add_children(i, d)
-
- model = self.get_model()
- for definition in definitions:
- name, enabled, value, value_check, attributes = \
- get_value_and_attributes(definition)
- if search:
- i = model.iter_children(None) # find this option
- while model[i][0] != name:
- i = model.iter_next(i)
- else:
- i = model.append(None,
- (name, '', False, False, '', False, {}, ))
- row = model[i]
- row[3] = enabled
- row[4] = value
- row[5] = value_check
- row[6] = attributes
- add_children(i, definition)
diff --git a/misc/py_control_client/MyServer/GUI/GUIConfig.py
b/misc/py_control_client/MyServer/GUI/GUIConfig.py
deleted file mode 100644
index fc14f6e..0000000
--- a/misc/py_control_client/MyServer/GUI/GUIConfig.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from gobject import TYPE_STRING, TYPE_BOOLEAN
-
-options = {}
-
-# Control
-options['control.enabled'] = ('Set this to yes if you want to enable control
protocol.', 'bool', )
-options['control.admin'] = ('Set here the name for the control admin.',
'string', )
-options['control.password'] = ('Define here a good, strong password for the
admin.', 'string', )
-
-# FTP
-options['ftp.allow_anonymous'] = ('Allow anonymous login.', 'bool', )
-options['ftp.anonymous_need_pass'] = ('If anonymous allowed, tells if needs
pass.', 'bool', )
-options['ftp.allow_asynchronous_cmds'] = ('Allow asynchronous cmds like Abor,
Quit, Stat.', 'bool', )
-options['ftp.allow_pipelining'] = ('Allow clients to send more than one
command to server in one request.', 'bool', )
-options['ftp.allow_store'] = ('Allow clients to change server files.', 'bool',
)
-
-# HTTP
-options['http.use_error_file'] = ('Set this to yes to use personalized error
pages from system directory.', 'bool', )
-options['http.dir.css'] = ('Define the folder browsing style.', 'string', )
-options['http.use_home_directory'] = ('Enable home directory per user',
'bool', )
-options['http.home_directory'] = ('Define name for home directory browsing.',
'string', )
-options['http.default_file'] = ('Default filename to send in a directory if
the file isn\'t in the path then the directory content is sent.', 'list', )
-
-# Server
-options['server.language'] = ('Choose the language to use for the server.',
'string', )
-options['server.verbosity'] = ('Verbosity on log file.', 'integer', )
-options['server.static_threads'] = ('Number of serving threads always
active.', 'integer', )
-options['server.max_threads'] = ('Maximum number of serving threads that the
scheduler can create.', 'integer', )
-options['server.buffer_size'] = ('Dimension of every buffer in bytes.',
'integer', )
-options['server.max_connections'] = ('Define the max number of connections to
allow to server. 0 means allow infinite connections.', 'integer', )
-options['server.max_accepted_connections'] = ('Define max number of
connections to accept.', 'integer', )
-options['server.max_log_size'] = ('Max size of the log file in bytes.',
'integer', )
-options['server.admin'] = ('Administrator e-mail.', 'string', )
-options['server.max_files_cache'] = ('Max cache size for static files.',
'integer', )
-options['server.max_file_cache'] = ('Max cache size for single static file.',
'integer', )
-options['server.min_file_cache'] = ('Min cache size for single static file.',
'integer', )
-options['server.max_servers'] = ('Maximum number of external servers that can
be executed.', 'integer', )
-
-# Log color
-options['log_color.info_fg'] = ('Info log foreground colour.', 'string', )
-options['log_color.info_bg'] = ('Info log background colour.', 'string', )
-options['log_color.warning_fg'] = ('Warning log foreground colour.', 'string',
)
-options['log_color.warning_bg'] = ('Warning log background colour.', 'string',
)
-options['log_color.error_fg'] = ('Error log foreground colour.', 'string', )
-options['log_color.error_bg'] = ('Error log background colour.', 'string', )
-
-# Other
-options['connection.timeout'] = ('Timeout for every client\'s connected to
server. If the client doesn\'t request anything for n seconds the connection
with the client is closed. Set this to 0 if you don\'t want to use
keep-alive-connections', 'integer', )
-options['gzip.threshold'] = ('Define the gzip compression threshold value.',
'integer', )
-options['symlinks.follow'] = ('Define if links should be followed.', 'bool', )
-
-# don't put 'other' or 'unknown' here
-tabs = ['server', 'control', 'ftp', 'http', 'log_color']
-
-# MIME types
-mime_name = 'mime'
-mime_attributes = ['handler', 'self_executed', 'param', 'path']
-mime_lists = ['extensions', 'filters']
-
-# VHosts
-vhost_name = 'name'
-vhost_attributes = ['port', 'protocol', 'doc_root', 'sys_root', 'private_key',
'certificate']
-vhost_lists = [
- ('ip', (
- ('ip', TYPE_STRING, '', ),
- ),
- ),
- ('host', (
- ('host name', TYPE_STRING, '', ),
- ('use regexp', TYPE_BOOLEAN, False, ),
- ),
- ),
- ]
diff --git a/misc/py_control_client/MyServer/GUI/MIMEWidgets.py
b/misc/py_control_client/MyServer/GUI/MIMEWidgets.py
deleted file mode 100644
index 2f3ed7e..0000000
--- a/misc/py_control_client/MyServer/GUI/MIMEWidgets.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gobject
-import GUIConfig
-from MyServer.pycontrollib.mimetypes import MIMEType
-
-class MimeTreeView(gtk.TreeView):
- def __init__(self):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gobject.TYPE_STRING, # mime name
- gobject.TYPE_PYOBJECT, # mime single attributes
- gobject.TYPE_PYOBJECT, # mime attribute lists
- gobject.TYPE_PYOBJECT, # mime definitions
- gobject.TYPE_PYOBJECT, # mime custom
- gobject.TYPE_PYOBJECT)) # mime custom attrib
- model = self.get_model()
- def mime_edited_handler(cell, path, text, data):
- model = data
- model[path][0] = text
- mime_renderer = gtk.CellRendererText()
- mime_renderer.set_property('editable', True)
- mime_renderer.connect('edited', mime_edited_handler, model)
- mime_column = gtk.TreeViewColumn('MIME Type')
- mime_column.pack_start(mime_renderer)
- mime_column.add_attribute(mime_renderer, 'text', 0)
- self.append_column(mime_column)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- def set_up(self, MIME_types):
- '''Fill model with data provided as list of MIME types.'''
- model = self.get_model()
- for mime in MIME_types:
- attributes = {}
- for attribute in GUIConfig.mime_attributes:
- a = getattr(mime, 'get_' + attribute)()
- if a is not None:
- attributes[attribute] = (a, True, )
- mime_lists = {}
- for mime_list in GUIConfig.mime_lists:
- mime_lists[mime_list] = getattr(mime, 'get_' + mime_list)()
- model.append((getattr(mime, 'get_' + GUIConfig.mime_name)(),
- attributes,
- mime_lists,
- mime.get_definitions(),
- mime.custom,
- mime.custom_attrib, ))
-
-class MimeTable(gtk.Table):
- def __init__(self, tree, def_tree, def_table):
- gtk.Table.__init__(self, len(GUIConfig.mime_attributes) +
- 3 * len(GUIConfig.mime_lists), 3)
-
- tree.connect('cursor-changed', self.cursor_changed)
- self.last_selected = None
- self.def_tree = def_tree
- self.def_table = def_table
-
- self.attributes = {}
- i = 0
- for attribute in GUIConfig.mime_attributes:
- label = gtk.Label(attribute)
- entry = gtk.Entry()
- check = gtk.CheckButton()
- self.attributes[attribute] = (entry, check, )
- self.attach(label, 0, 1, i, i + 1, yoptions = gtk.FILL)
- self.attach(entry, 1, 2, i, i + 1, yoptions = gtk.FILL)
- self.attach(check, 2, 3, i, i + 1, gtk.FILL, gtk.FILL)
- i += 1
- self.mime_lists = {}
- for mime_list in GUIConfig.mime_lists:
- tree = gtk.TreeView(gtk.ListStore(gobject.TYPE_STRING))
- tree_model = tree.get_model()
- def tree_edited_handler(cell, path, text, data):
- model = data
- model[path][0] = text
- tree_renderer = gtk.CellRendererText()
- tree_renderer.set_property('editable', True)
- tree_renderer.connect('edited', tree_edited_handler, tree_model)
- tree_column = gtk.TreeViewColumn(mime_list)
- tree_column.pack_start(tree_renderer)
- tree_column.add_attribute(tree_renderer, 'text', 0)
- tree.append_column(tree_column)
- tree_scroll = gtk.ScrolledWindow()
- tree_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- tree_scroll.set_shadow_type(gtk.SHADOW_OUT)
- tree_scroll.set_border_width(5)
- tree_scroll.add(tree)
-
- def add_to_tree(button, model):
- model.append(('', ))
- add_button = gtk.Button('Add')
- add_button.connect('clicked', add_to_tree, tree_model)
- def remove_from_tree(button, tree):
- model, selected = tree.get_selection().get_selected()
- if selected is not None:
- model.remove(selected)
- remove_button = gtk.Button('Remove')
- remove_button.connect('clicked', remove_from_tree, tree)
-
- self.mime_lists[mime_list] = tree_model
- self.attach(tree_scroll, 1, 2, i, i + 3)
- self.attach(add_button, 0, 1, i, i + 1, yoptions = gtk.FILL)
- self.attach(remove_button, 0, 1, i + 1, i + 2, yoptions = gtk.FILL)
- self.attach(gtk.Label(), 0, 1, i + 2, i + 3)
- i += 3
-
- def remove_current(self, tree):
- '''Remove currently selected MIME type.'''
- if self.last_selected is not None:
- model = tree.get_model()
- model.remove(self.last_selected)
- self.clear()
-
- def clear(self):
- '''Clear input widgets (including connected definition widgets).'''
- for entry, check in self.attributes.itervalues():
- entry.set_text('')
- check.set_active(False)
- for model in self.mime_lists.itervalues():
- model.clear()
- self.def_table.clear()
- self.def_tree.get_model().clear()
- self.last_selected = None
-
- def save_changed(self, tree):
- '''Save data from input widgets to model.'''
- if self.last_selected is not None:
- attributes = {}
- for attribute in self.attributes:
- entry, check = self.attributes[attribute]
- attributes[attribute] = (entry.get_text(), check.get_active(),
)
- mime_lists = {}
- for mime_list in GUIConfig.mime_lists:
- container = mime_lists[mime_list] = []
- model = self.mime_lists[mime_list]
- i = model.iter_children(None)
- while i is not None: # iterate over list elements
- container.append(model.get_value(i, 0))
- i = model.iter_next(i)
- row = tree.get_model()[self.last_selected]
- row[1] = attributes
- row[2] = mime_lists
- row[3] = self.def_table.make_def(self.def_tree)
-
- def cursor_changed(self, tree):
- self.save_changed(tree)
-
- self.clear()
-
- self.last_selected = current = tree.get_selection().get_selected()[1]
- row = tree.get_model()[current]
- for attribute in row[1]:
- entry, check = self.attributes[attribute]
- entry.set_text(row[1][attribute][0])
- check.set_active(row[1][attribute][1])
- for mime_list in row[2]:
- model = self.mime_lists[mime_list]
- for element in row[2][mime_list]:
- model.append((element, ))
- self.def_tree.set_up(row[3], False)
-
- def make_def(self, tree):
- '''Export all data as list of MIME types.'''
- self.save_changed(tree)
- model = tree.get_model()
- mimes = []
- i = model.iter_children(None)
- while i is not None: # iterate over MIME types
- row = model[i]
- mime = MIMEType(row[0], definitions = row[3])
- mime.custom = row[4]
- mime.custom_attrib = row[5]
- for attribute in row[1]:
- text, enabled = row[1][attribute]
- if enabled:
- getattr(mime, 'set_' + attribute)(text)
- for mime_list in row[2]:
- for entry in row[2][mime_list]:
- getattr(mime, 'add_' + mime_list[:-1])(entry)
- mimes.append(mime)
- i = model.iter_next(i)
- return mimes
diff --git a/misc/py_control_client/MyServer/GUI/SecurityWidgets.py
b/misc/py_control_client/MyServer/GUI/SecurityWidgets.py
deleted file mode 100644
index 9957fbe..0000000
--- a/misc/py_control_client/MyServer/GUI/SecurityWidgets.py
+++ /dev/null
@@ -1,732 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gobject
-from MyServer.pycontrollib.security import SecurityList, User, Return, \
- Condition, Permission, SecurityElement
-from MyServer.pycontrollib.definition import DefinitionElement, DefinitionTree
-
-class SecurityTree(gtk.TreeView):
- def __init__(self, security_table):
- gtk.TreeView.__init__(self, gtk.TreeStore(
- gobject.TYPE_STRING, # tag
- gobject.TYPE_PYOBJECT)) # object
- renderer = gtk.CellRendererText()
- column = gtk.TreeViewColumn('tag')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 0)
- self.append_column(column)
-
- self.security_table = security_table
-
- self.last_selected = None
- self.connect('cursor-changed', self.cursor_changed)
-
- self.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
- [('text/plain', 0, 0)],
- gtk.gdk.ACTION_MOVE)
- self.enable_model_drag_dest([('text/plain', gtk.TARGET_SAME_WIDGET,
0)],
- gtk.gdk.ACTION_MOVE)
- def get_data(tree, context, selection, target_id, etime):
- model, selected = tree.get_selection().get_selected()
- data = model.get_value(selected, 1)
- selection.set(selection.target, 8, str(data))
- self.connect('drag_data_get', get_data)
- def data_received(tree, context, x, y, selection, info, etime):
- model = tree.get_model()
- try:
- data = SecurityElement.from_string(selection.data)
- except:
- return # will fall if someone moves SECURITY
- drop_info = tree.get_dest_row_at_pos(x, y)
- if drop_info:
- path, position = drop_info
- it = model.get_iter(path)
- if position in [gtk.TREE_VIEW_DROP_BEFORE,
- gtk.TREE_VIEW_DROP_AFTER]:
- parent_tag = model.get_value(model.iter_parent(it), 0)
- else:
- parent_tag = model.get_value(it, 0)
- # limit places where rows can be dropped
- if not ((data.tag == 'DEFINE element' and
- parent_tag == 'DEFINE tree') or
- parent_tag in ['SECURITY', 'CONDITION']):
- return
- if position == gtk.TREE_VIEW_DROP_BEFORE:
- model.insert_before(None, it, (data.tag, data, ))
- elif position == gtk.TREE_VIEW_DROP_AFTER:
- model.insert_after(None, it, (data.tag, data, ))
- else:
- model.append(it, (data.tag, data, ))
- else:
- return # drop on widget but not on any row
- if context.action == gtk.gdk.ACTION_MOVE:
- context.finish(True, True, etime)
- self.connect('drag_data_received', data_received)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- def clear(self):
- self.get_model().clear()
- self.last_selected = None
- self.get_model().append(None, ('SECURITY', SecurityList(), ))
- self.security_table.empty_table.security_check.set_active(False)
- self.security_table.switch_table('SECURITY')
-
- def set_up(self, security_list):
- def add_from_definition_tree(parent, model, definition):
- for element in definition.get_definitions():
- x = model.append(parent, (element.tag, element, ))
- if element.tag == 'DEFINE tree':
- add_from_definition_tree(x, model, element)
- def add_from_condition(parent, model, condition):
- for element in condition.get_sub_elements():
- x = model.append(parent, (element.tag, element, ))
- if element.tag == 'CONDITION':
- add_from_condition(x, model, element)
- self.security_table.empty_table.security_check.set_active(True)
- self.security_table.switch_table('SECURITY')
- model = self.get_model()
- self.last_selected = None
- model.clear()
- parent = model.append(None, ('SECURITY', security_list))
- for element in security_list.get_elements():
- x = model.append(parent, (element.tag, element, ))
- if element.tag == 'CONDITION':
- add_from_condition(x, model, element)
- elif element.tag == 'DEFINE tree':
- add_from_definition_tree(x, model, element)
-
- def save(self):
- if self.last_selected is None:
- return
- model = self.get_model()
- row = model[self.last_selected]
- tag = row[0]
- data = row[1]
- if tag == 'USER':
- table = self.security_table.user_table
- if table.name_check.get_active():
- data.set_name(table.name_entry.get_text())
- else:
- data.set_name(None)
- if table.password_check.get_active():
- data.set_password(table.password_entry.get_text())
- else:
- data.set_password(None)
- combo = table.read_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_read(value == 'Yes' if value != 'empty' else None)
- combo = table.execute_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_execute(value == 'Yes' if value != 'empty' else None)
- combo = table.browse_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_browse(value == 'Yes'if value != 'empty' else None)
- combo = table.delete_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_delete(value == 'Yes' if value != 'empty' else None)
- combo = table.write_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_write(value == 'Yes' if value != 'empty' else None)
- elif tag == 'CONDITION':
- table = self.security_table.condition_table
- if table.name_check.get_active():
- data.set_name(table.name_entry.get_text())
- else:
- data.set_name(None)
- if table.value_check.get_active():
- data.set_value(table.value_entry.get_text())
- else:
- data.set_value(None)
- combo = table.regex_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_regex(value == 'Yes' if value != 'empty' else None)
- combo = table.reverse_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_reverse(value == 'Yes' if value != 'empty' else None)
- elif tag == 'PERMISSION':
- table = self.security_table.permission_table
- combo = table.read_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_read(value == 'Yes' if value != 'empty' else None)
- combo = table.execute_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_execute(value == 'Yes' if value != 'empty' else None)
- combo = table.browse_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_browse(value == 'Yes'if value != 'empty' else None)
- combo = table.delete_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_delete(value == 'Yes' if value != 'empty' else None)
- combo = table.write_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_write(value == 'Yes' if value != 'empty' else None)
- elif tag == 'RETURN':
- table = self.security_table.return_table
- combo = table.value_combo
- value = combo.get_model()[combo.get_active()][0]
- data.set_value(value if value != 'empty' else None)
- elif tag == 'DEFINE element' or tag == 'DEFINE tree':
- table = self.security_table.definition_table
- if table.name_check.get_active():
- data.set_name(table.name_entry.get_text())
- else:
- data.set_name(None)
- variables = []
- for variable in data.get_attributes():
- variables.append(variable)
- for variable in variables:
- data.remove_attribute(variable)
- model = table.attribute_tree.get_model()
- i = model.iter_children(None)
- while i is not None: # iterate over attributes
- data.set_attribute(
- model.get_value(i, 0),
- model.get_value(i, 1))
- i = model.iter_next(i)
- if tag == 'DEFINE element':
- if table.value_check.get_active():
- data.set_attribute('value', table.value_entry.get_text())
-
- def update_gui(self, tag, data):
- if tag == 'USER':
- table = self.security_table.user_table
- if data.get_name() is None:
- table.name_check.set_active(False)
- table.name_entry.set_text('')
- else:
- table.name_check.set_active(True)
- table.name_entry.set_text(data.get_name())
- if data.get_password() is None:
- table.password_check.set_active(False)
- table.password_entry.set_text('')
- else:
- table.password_check.set_active(True)
- table.password_entry.set_text(data.get_password())
- combo = table.read_combo
- value = 2 if data.get_read() is None else int(not data.get_read())
- combo.set_active(value)
- combo = table.execute_combo
- value = 2 if data.get_execute() is None else int(not
data.get_execute())
- combo.set_active(value)
- combo = table.browse_combo
- value = 2 if data.get_browse() is None else int(not
data.get_browse())
- combo.set_active(value)
- combo = table.delete_combo
- value = 2 if data.get_delete() is None else int(not
data.get_delete())
- combo.set_active(value)
- combo = table.write_combo
- value = 2 if data.get_write() is None else int(not
data.get_write())
- combo.set_active(value)
- elif tag == 'CONDITION':
- table = self.security_table.condition_table
- if data.get_name() is None:
- table.name_check.set_active(False)
- table.name_entry.set_text('')
- else:
- table.name_check.set_active(True)
- table.name_entry.set_text(data.get_name())
- if data.get_value() is None:
- table.value_check.set_active(False)
- table.value_entry.set_text('')
- else:
- table.value_check.set_active(True)
- table.value_entry.set_text(data.get_value())
- combo = table.regex_combo
- value = 2 if data.get_regex() is None else int(not
data.get_regex())
- combo.set_active(value)
- combo = table.reverse_combo
- value = 2 if data.get_reverse() is None else int(not
data.get_reverse())
- combo.set_active(value)
- elif tag == 'PERMISSION':
- table = self.security_table.permission_table
- combo = table.read_combo
- value = 2 if data.get_read() is None else int(not data.get_read())
- combo.set_active(value)
- combo = table.execute_combo
- value = 2 if data.get_execute() is None else int(not
data.get_execute())
- combo.set_active(value)
- combo = table.browse_combo
- value = 2 if data.get_browse() is None else int(not
data.get_browse())
- combo.set_active(value)
- combo = table.delete_combo
- value = 2 if data.get_delete() is None else int(not
data.get_delete())
- combo.set_active(value)
- combo = table.write_combo
- value = 2 if data.get_write() is None else int(not
data.get_write())
- combo.set_active(value)
- elif tag == 'RETURN':
- table = self.security_table.return_table
- combo = table.value_combo
- value = 2 if data.get_value() is None else int(data.get_value()
== 'DENY')
- combo.set_active(value)
- elif tag == 'DEFINE element' or tag == 'DEFINE tree':
- table = self.security_table.definition_table
- model = table.attribute_tree.get_model()
- model.clear()
- for variable, value in data.get_attributes().iteritems():
- if variable != 'value':
- model.append((variable, value, ))
- if data.get_name() is None:
- table.name_check.set_active(False)
- table.name_entry.set_text('')
- else:
- table.name_check.set_active(True)
- table.name_entry.set_text(data.get_name())
- if tag == 'DEFINE element':
- try:
- table.value_check.set_active(True)
- table.value_entry.set_text(data.get_attribute('value'))
- except KeyError:
- table.value_check.set_active(False)
- table.value_entry.set_text('')
-
- def cursor_changed(self, tree):
- self.save()
-
- model, selected = tree.get_selection().get_selected()
- self.last_selected = selected
- row = model[selected]
- self.security_table.switch_table(row[0])
-
- self.update_gui(row[0], row[1])
-
- def add_sub_element(self, tag):
- model, selected = self.get_selection().get_selected()
- if selected is None:
- return
- if tag == 'USER':
- add = User()
- elif tag == 'RETURN':
- add = Return()
- elif tag == 'CONDITION':
- add = Condition()
- elif tag == 'PERMISSION':
- add = Permission()
- elif tag == 'DEFINE element':
- add = DefinitionElement()
- elif tag == 'DEFINE tree':
- add = DefinitionTree()
- model.append(selected, (tag, add, ))
-
- def remove_element(self):
- model, selected = self.get_selection().get_selected()
- model.remove(selected)
- self.last_selected = None
- self.security_table.switch_table('SECURITY')
-
- def export(self):
- def add_definition_tree(parent, i, model):
- while len(parent.get_definitions()): # remove all children
- parent.remove_definition(0)
- i = model.iter_children(i)
- while i is not None:
- tag = model.get_value(i, 0)
- data = model.get_value(i, 1)
- parent.add_definition(data)
- if tag == 'DEFINE tree':
- add_definition_tree(data, i, model)
- i = model.iter_next(i)
- def add_condition(parent, i, model):
- while len(parent.get_sub_elements()): # remove all children
- parent.remove_sub_element(0)
- i = model.iter_children(i)
- while i is not None:
- tag = model.get_value(i, 0)
- data = model.get_value(i, 1)
- parent.add_sub_element(data)
- if tag == 'DEFINE tree':
- add_definition_tree(data, i, model)
- elif tag == 'CONDITION':
- add_condition(data, i, model)
- i = model.iter_next(i)
- self.save()
- model = self.get_model()
- i = model.iter_children(None)
- security = model.get_value(i, 1)
- while len(security.get_elements()): # remove all children
- security.remove_element(0)
- i = model.iter_children(i)
- while i is not None:
- tag = model.get_value(i, 0)
- data = model.get_value(i, 1)
- security.add_element(data)
- if tag == 'DEFINE tree':
- add_definition_tree(data, i, model)
- elif tag == 'CONDITION':
- add_condition(data, i, model)
- i = model.iter_next(i)
- return security
-
-class UserTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 8, 3)
-
- def remove_element(button, tree):
- tree.remove_element()
- button = gtk.Button('Remove this element')
- button.connect('clicked', remove_element, security_tree)
- self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('name'), 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.name_entry = gtk.Entry()
- self.attach(self.name_entry, 1, 2, 1, 2, yoptions = gtk.FILL)
- self.name_check = gtk.CheckButton()
- self.attach(self.name_check, 2, 3, 1, 2, gtk.FILL, gtk.FILL)
-
- self.attach(gtk.Label('password'), 0, 1, 2, 3, gtk.FILL, gtk.FILL)
- self.password_entry = gtk.Entry()
- self.attach(self.password_entry, 1, 2, 2, 3, yoptions = gtk.FILL)
- self.password_check = gtk.CheckButton()
- self.attach(self.password_check, 2, 3, 2, 3, gtk.FILL, gtk.FILL)
-
- def add_options(combo):
- combo.append_text('Yes')
- combo.append_text('No')
- combo.append_text('empty')
-
- self.attach(gtk.Label('READ'), 0, 1, 3, 4, gtk.FILL, gtk.FILL)
- self.read_combo = gtk.combo_box_new_text()
- add_options(self.read_combo)
- self.attach(self.read_combo, 1, 2, 3, 4, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('EXECUTE'), 0, 1, 4, 5, gtk.FILL, gtk.FILL)
- self.execute_combo = gtk.combo_box_new_text()
- add_options(self.execute_combo)
- self.attach(self.execute_combo, 1, 2, 4, 5, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('BROWSE'), 0, 1, 5, 6, gtk.FILL, gtk.FILL)
- self.browse_combo = gtk.combo_box_new_text()
- add_options(self.browse_combo)
- self.attach(self.browse_combo, 1, 2, 5, 6, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('DELETE'), 0, 1, 6, 7, gtk.FILL, gtk.FILL)
- self.delete_combo = gtk.combo_box_new_text()
- add_options(self.delete_combo)
- self.attach(self.delete_combo, 1, 2, 6, 7, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('WRITE'), 0, 1, 7, 8, gtk.FILL, gtk.FILL)
- self.write_combo = gtk.combo_box_new_text()
- add_options(self.write_combo)
- self.attach(self.write_combo, 1, 2, 7, 8, yoptions = gtk.FILL)
-
-class ConditionTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 6, 3)
-
- def remove_element(button, tree):
- tree.remove_element()
- button = gtk.Button('Remove this element')
- button.connect('clicked', remove_element, security_tree)
- self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('name'), 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.name_entry = gtk.Entry()
- self.attach(self.name_entry, 1, 2, 1, 2, yoptions = gtk.FILL)
- self.name_check = gtk.CheckButton()
- self.attach(self.name_check, 2, 3, 1, 2, gtk.FILL, gtk.FILL)
-
- self.attach(gtk.Label('value'), 0, 1, 2, 3, gtk.FILL, gtk.FILL)
- self.value_entry = gtk.Entry()
- self.attach(self.value_entry, 1, 2, 2, 3, yoptions = gtk.FILL)
- self.value_check = gtk.CheckButton()
- self.attach(self.value_check, 2, 3, 2, 3, gtk.FILL, gtk.FILL)
-
- def add_options(combo):
- combo.append_text('Yes')
- combo.append_text('No')
- combo.append_text('empty')
-
- self.attach(gtk.Label('regex'), 0, 1, 3, 4, gtk.FILL, gtk.FILL)
- self.regex_combo = gtk.combo_box_new_text()
- add_options(self.regex_combo)
- self.attach(self.regex_combo, 1, 2, 3, 4, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('reverse'), 0, 1, 4, 5, gtk.FILL, gtk.FILL)
- self.reverse_combo = gtk.combo_box_new_text()
- add_options(self.reverse_combo)
- self.attach(self.reverse_combo, 1, 2, 4, 5, yoptions = gtk.FILL)
-
- def add_sub_element(button, combo, tree):
- tag = combo.get_model()[combo.get_active()][0]
- tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
- self.attach(self.add_sub_element_button, 0, 1, 5, 6, gtk.FILL,
gtk.FILL)
- self.add_sub_element_combo = gtk.combo_box_new_text()
- self.add_sub_element_combo.append_text('USER')
- self.add_sub_element_combo.append_text('CONDITION')
- self.add_sub_element_combo.append_text('PERMISSION')
- self.add_sub_element_combo.append_text('RETURN')
- self.add_sub_element_combo.append_text('DEFINE element')
- self.add_sub_element_combo.append_text('DEFINE tree')
- self.add_sub_element_combo.set_active(0)
- self.attach(self.add_sub_element_combo, 1, 2, 5, 6, gtk.FILL, gtk.FILL)
- self.add_sub_element_button.connect('clicked', add_sub_element,
- self.add_sub_element_combo,
- security_tree)
-
-class PermissionTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 6, 2)
-
- def remove_element(button, tree):
- tree.remove_element()
- button = gtk.Button('Remove this element')
- button.connect('clicked', remove_element, security_tree)
- self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
-
- def add_options(combo):
- combo.append_text('Yes')
- combo.append_text('No')
- combo.append_text('empty')
-
- self.attach(gtk.Label('READ'), 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.read_combo = gtk.combo_box_new_text()
- add_options(self.read_combo)
- self.attach(self.read_combo, 1, 2, 1, 2, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('EXECUTE'), 0, 1, 2, 3, gtk.FILL, gtk.FILL)
- self.execute_combo = gtk.combo_box_new_text()
- add_options(self.execute_combo)
- self.attach(self.execute_combo, 1, 2, 2, 3, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('BROWSE'), 0, 1, 3, 4, gtk.FILL, gtk.FILL)
- self.browse_combo = gtk.combo_box_new_text()
- add_options(self.browse_combo)
- self.attach(self.browse_combo, 1, 2, 3, 4, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('DELETE'), 0, 1, 4, 5, gtk.FILL, gtk.FILL)
- self.delete_combo = gtk.combo_box_new_text()
- add_options(self.delete_combo)
- self.attach(self.delete_combo, 1, 2, 4, 5, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('WRITE'), 0, 1, 5, 6, gtk.FILL, gtk.FILL)
- self.write_combo = gtk.combo_box_new_text()
- add_options(self.write_combo)
- self.attach(self.write_combo, 1, 2, 5, 6, yoptions = gtk.FILL)
-
-class ReturnTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 2, 2)
-
- def remove_element(button, tree):
- tree.remove_element()
- button = gtk.Button('Remove this element')
- button.connect('clicked', remove_element, security_tree)
- self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
-
- self.attach(gtk.Label('value'), 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.value_combo = gtk.combo_box_new_text()
- self.value_combo.append_text('ALLOW')
- self.value_combo.append_text('DENY')
- self.value_combo.append_text('empty')
- self.attach(self.value_combo, 1, 2, 1, 2, yoptions = gtk.FILL)
-
-class DefinitionTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 7, 3)
-
- def remove_element(button, tree):
- tree.remove_element()
- button = gtk.Button('Remove this element')
- button.connect('clicked', remove_element, security_tree)
- self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
-
- def add_sub_element(button, combo, tree):
- tag = combo.get_model()[combo.get_active()][0]
- tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
- self.attach(self.add_sub_element_button, 0, 1, 1, 2, gtk.FILL,
gtk.FILL)
- self.add_sub_element_combo = gtk.combo_box_new_text()
- self.add_sub_element_combo.append_text('DEFINE element')
- self.add_sub_element_combo.append_text('DEFINE tree')
- self.add_sub_element_combo.set_active(0)
- self.attach(self.add_sub_element_combo, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
- self.add_sub_element_button.connect('clicked', add_sub_element,
- self.add_sub_element_combo,
- security_tree)
-
- self.attach(gtk.Label('name'), 0, 1, 2, 3, gtk.FILL, gtk.FILL)
- self.name_entry = gtk.Entry()
- self.attach(self.name_entry, 1, 2, 2, 3, yoptions = gtk.FILL)
- self.name_check = gtk.CheckButton()
- self.attach(self.name_check, 2, 3, 2, 3, gtk.FILL, gtk.FILL)
-
- self.value_label = gtk.Label('value')
- self.attach(self.value_label, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
- self.value_entry = gtk.Entry()
- self.attach(self.value_entry, 1, 2, 3, 4, yoptions = gtk.FILL)
- self.value_check = gtk.CheckButton()
- self.attach(self.value_check, 2, 3, 3, 4, gtk.FILL, gtk.FILL)
-
- self.attribute_tree = gtk.TreeView(gtk.ListStore(
- gobject.TYPE_STRING, # variable
- gobject.TYPE_STRING)) # value
- model = self.attribute_tree.get_model()
- def edited_handler(cell, path, text, data):
- model, col = data
- model[path][col] = text
- renderer = gtk.CellRendererText()
- renderer.set_property('editable', True)
- renderer.connect('edited', edited_handler, (model, 0, ))
- column = gtk.TreeViewColumn('variable')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 0)
- self.attribute_tree.append_column(column)
- renderer = gtk.CellRendererText()
- renderer.set_property('editable', True)
- renderer.connect('edited', edited_handler, (model, 1, ))
- column = gtk.TreeViewColumn('value')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 1)
- self.attribute_tree.append_column(column)
- scroll = gtk.ScrolledWindow()
- scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- scroll.set_shadow_type(gtk.SHADOW_OUT)
- scroll.set_border_width(5)
- scroll.add(self.attribute_tree)
- self.attach(scroll, 0, 2, 6, 7)
-
- def add_attribute(button, model):
- model.append(('', '', ))
- add_button = gtk.Button('add')
- add_button.connect('clicked', add_attribute, model)
- self.attach(add_button, 0, 2, 4, 5, gtk.FILL, gtk.FILL)
-
- def remove_attribute(button, tree):
- model, selected = tree.get_selection().get_selected()
- if selected is not None:
- model.remove(selected)
- remove_button = gtk.Button('remove')
- remove_button.connect('clicked', remove_attribute, self.attribute_tree)
- self.attach(remove_button, 0, 2, 5, 6, gtk.FILL, gtk.FILL)
-
- def set_tree(self, tree):
- if tree:
- self.add_sub_element_button.show()
- self.add_sub_element_combo.show()
- self.value_label.hide()
- self.value_entry.hide()
- self.value_check.hide()
- else:
- self.add_sub_element_button.hide()
- self.add_sub_element_combo.hide()
- self.value_label.show()
- self.value_entry.show()
- self.value_check.show()
-
-class EmptyTable(gtk.Table):
- def __init__(self, security_tree):
- gtk.Table.__init__(self, 2, 2)
-
- self.attach(gtk.Label('Use security file'), 0, 1, 0, 1, gtk.FILL,
gtk.FILL)
- self.security_check = gtk.CheckButton()
- self.attach(self.security_check, 1, 2, 0, 1, yoptions = gtk.FILL)
-
- def add_sub_element(button, combo, tree):
- tag = combo.get_model()[combo.get_active()][0]
- tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
- self.attach(self.add_sub_element_button, 0, 1, 1, 2, gtk.FILL,
gtk.FILL)
- self.add_sub_element_combo = gtk.combo_box_new_text()
- self.add_sub_element_combo.append_text('USER')
- self.add_sub_element_combo.append_text('CONDITION')
- self.add_sub_element_combo.append_text('PERMISSION')
- self.add_sub_element_combo.append_text('RETURN')
- self.add_sub_element_combo.append_text('DEFINE element')
- self.add_sub_element_combo.append_text('DEFINE tree')
- self.add_sub_element_combo.set_active(0)
- self.attach(self.add_sub_element_combo, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
- self.add_sub_element_button.connect('clicked', add_sub_element,
- self.add_sub_element_combo,
- security_tree)
-
-class SecurityTable(gtk.Table):
- def __init__(self):
- gtk.Table.__init__(self, 1, 2)
-
- self.security_tree = SecurityTree(self)
-
- self.empty_table = EmptyTable(self.security_tree)
- self.user_table = UserTable(self.security_tree)
- self.condition_table = ConditionTable(self.security_tree)
- self.permission_table = PermissionTable(self.security_tree)
- self.return_table = ReturnTable(self.security_tree)
- self.definition_table = DefinitionTable(self.security_tree)
- self.table_notebook = gtk.Notebook()
- self.table_notebook.append_page(self.empty_table)
- self.table_notebook.append_page(self.user_table)
- self.table_notebook.append_page(self.condition_table)
- self.table_notebook.append_page(self.permission_table)
- self.table_notebook.append_page(self.return_table)
- self.table_notebook.append_page(self.definition_table)
- self.table_notebook.set_show_tabs(False)
-
- self.attach(self.security_tree.scroll, 0, 1, 0, 1)
- self.attach(self.table_notebook, 1, 2, 0, 1, gtk.FILL)
-
- def read_from_file(self, browser):
- self.switch_table('SECURITY')
- self.security_tree.clear()
- try:
- security = SecurityList.from_string(
- browser.get_file('security.xml'))
- self.security_tree.set_up(security)
- except:
- self.security_tree.clear()
-
- def write_to_file(self, browser):
- if self.empty_table.security_check.get_active():
- security = self.security_tree.export()
- browser.put_file('security.xml', str(security))
- else:
- try:
- browser.remove_file('security.xml')
- except OSError: # file does not exist
- pass
-
- def switch_table(self, tag):
- if tag == 'SECURITY':
- self.current_table = self.empty_table
- self.table_notebook.set_current_page(0)
- elif tag == 'USER':
- self.current_table = self.user_table
- self.table_notebook.set_current_page(1)
- elif tag == 'CONDITION':
- self.current_table = self.condition_table
- self.table_notebook.set_current_page(2)
- elif tag == 'PERMISSION':
- self.current_table = self.permission_table
- self.table_notebook.set_current_page(3)
- elif tag == 'RETURN':
- self.current_table = self.return_table
- self.table_notebook.set_current_page(4)
- elif tag == 'DEFINE element':
- self.current_table = self.definition_table
- self.definition_table.set_tree(False)
- self.table_notebook.set_current_page(5)
- elif tag == 'DEFINE tree':
- self.current_table = self.definition_table
- self.definition_table.set_tree(True)
- self.table_notebook.set_current_page(5)
diff --git a/misc/py_control_client/MyServer/GUI/VHostWidgets.py
b/misc/py_control_client/MyServer/GUI/VHostWidgets.py
deleted file mode 100644
index 165b1df..0000000
--- a/misc/py_control_client/MyServer/GUI/VHostWidgets.py
+++ /dev/null
@@ -1,515 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import gtk
-import gobject
-import GUIConfig
-from MyServer.pycontrollib.log import Log, Stream
-from MyServer.pycontrollib.vhost import VHost
-
-class FilterTreeView(gtk.TreeView):
- def __init__(self):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gobject.TYPE_STRING))
- model = self.get_model()
- def edited_handler(cell, path, text, model):
- model[path][0] = text
- renderer = gtk.CellRendererText()
- renderer.set_property('editable', True)
- renderer.connect('edited', edited_handler, model)
- column = gtk.TreeViewColumn('Filter')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 0)
- self.append_column(column)
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
-class StreamTreeView(gtk.TreeView):
- def __init__(self, filter_tree, cycle, cycle_gzip):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gobject.TYPE_STRING, # stream location
- gobject.TYPE_PYOBJECT, # list of filters
- gobject.TYPE_PYOBJECT, # (cycle, cycle active, )
- gobject.TYPE_BOOLEAN, # cycle_gzip
- gobject.TYPE_PYOBJECT, # stream custom
- gobject.TYPE_PYOBJECT)) # stream custom attrib
- self.cycle = cycle
- self.cycle_gzip = cycle_gzip
- self.filter_model = filter_tree.get_model()
- model = self.get_model()
- def edited_handler(cell, path, text, model):
- model[path][0] = text
- renderer = gtk.CellRendererText()
- renderer.set_property('editable', True)
- renderer.connect('edited', edited_handler, model)
- column = gtk.TreeViewColumn('Stream')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 0)
- self.append_column(column)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- self.last_selected = None
- self.connect('cursor-changed', self.cursor_changed)
-
- def clear(self):
- self.filter_model.clear()
- self.last_selected = None
- entry, check = self.cycle
- entry.set_value(0)
- check.set_active(False)
- self.cycle_gzip.set_active(False)
-
- def save_changed(self):
- model = self.filter_model
- if self.last_selected is not None:
- filters = []
- i = model.iter_children(None)
- while i is not None: # iterate over filters
- filters.append(model[i][0])
- i = model.iter_next(i)
- row = self.get_model()[self.last_selected]
- row[1] = filters
- entry, check = self.cycle
- row[2] = (entry.get_value(), check.get_active(), )
- row[3] = self.cycle_gzip.get_active()
-
- def cursor_changed(self, tree):
- self.save_changed()
-
- self.clear()
- model = self.filter_model
-
- self.last_selected = current = \
- tree.get_selection().get_selected()[1]
- row = tree.get_model()[current]
- for element in row[1]: # add all filters
- model.append((element, ))
- entry, check = self.cycle
- entry.set_value(row[2][0])
- check.set_active(row[2][1])
- self.cycle_gzip.set_active(row[3])
-
-class LogTreeView(gtk.TreeView):
- def __init__(self, stream_tree, log_type):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gobject.TYPE_STRING, # log name
- gobject.TYPE_PYOBJECT, # list of streams
- gobject.TYPE_PYOBJECT, # (log_type, log_type enabled, )
- gobject.TYPE_PYOBJECT, # log custom
- gobject.TYPE_PYOBJECT)) # log custom attrib
- self.stream_tree = stream_tree
- self.log_type = log_type
- model = self.get_model()
- def edited_handler(cell, path, text, model):
- model[path][0] = text
- renderer = gtk.CellRendererText()
- renderer.set_property('editable', True)
- renderer.connect('edited', edited_handler, model)
- column = gtk.TreeViewColumn('Log')
- column.pack_start(renderer)
- column.add_attribute(renderer, 'text', 0)
- self.append_column(column)
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- self.last_selected = None
- self.connect('cursor-changed', self.cursor_changed)
-
- def clear(self):
- self.stream_tree.clear()
- self.last_selected = None
- self.stream_tree.get_model().clear()
- entry, check = self.log_type
- entry.set_text('')
- check.set_active(False)
-
- def save_changed(self):
- self.stream_tree.save_changed()
- model = self.stream_tree.get_model()
- if self.last_selected is not None:
- streams = []
- i = model.iter_children(None)
- while i is not None: # iterate over streams
- row = model[i]
- streams.append((row[0], row[1], row[2], row[3], row[4],
row[5], ))
- i = model.iter_next(i)
- row = self.get_model()[self.last_selected]
- row[1] = streams
- entry, check = self.log_type
- row[2] = (entry.get_text(), check.get_active(), )
-
- def cursor_changed(self, tree):
- self.save_changed()
-
- self.clear()
- model = self.stream_tree.get_model()
-
- self.last_selected = current = \
- tree.get_selection().get_selected()[1]
- row = tree.get_model()[current]
- for stream in row[1]:
- model.append(stream)
- entry, check = self.log_type
- entry.set_text(row[2][0])
- check.set_active(row[2][1])
-
- def get_logs(self):
- self.save_changed()
- model = self.get_model()
- logs = []
- i = model.iter_children(None)
- while i is not None: # iterate over logs
- row = model[i]
- logs.append((row[0], row[1], row[2], row[3], row[4], ))
- i = model.iter_next(i)
- return logs
-
- def set_logs(self, logs):
- self.clear()
- self.last_selected = None
- model = self.get_model()
- model.clear()
- for log in logs:
- model.append((log[0], log[1], log[2], log[3], log[4], ))
-
-class VHostTreeView(gtk.TreeView):
- def __init__(self):
- gtk.TreeView.__init__(self, gtk.ListStore(
- gobject.TYPE_STRING, # vhost name
- gobject.TYPE_PYOBJECT, # vhost single attributes
- gobject.TYPE_PYOBJECT, # vhost attribute lists
- gobject.TYPE_PYOBJECT, # vhost logs
- gobject.TYPE_PYOBJECT, # vhost custom
- gobject.TYPE_PYOBJECT)) # vhost custom attrib
- model = self.get_model()
- def vhost_edited_handler(cell, path, text, data):
- model = data
- model[path][0] = text
- vhost_renderer = gtk.CellRendererText()
- vhost_renderer.set_property('editable', True)
- vhost_renderer.connect('edited', vhost_edited_handler, model)
- vhost_column = gtk.TreeViewColumn('VHost')
- vhost_column.pack_start(vhost_renderer)
- vhost_column.add_attribute(vhost_renderer, 'text', 0)
- self.append_column(vhost_column)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.set_shadow_type(gtk.SHADOW_OUT)
- self.scroll.set_border_width(5)
- self.scroll.add(self)
-
- def set_up(self, vhosts):
- '''Fill model with data provided as list of Vhosts.'''
- model = self.get_model()
- for vhost in vhosts:
- attributes = {}
- for attribute in GUIConfig.vhost_attributes:
- a = getattr(vhost, 'get_' + attribute)()
- if a is not None:
- attributes[attribute] = (str(a), True, )
- vhost_lists = {}
- for vhost_list in GUIConfig.vhost_lists:
- vhost_list = vhost_list[0]
- l = getattr(vhost, 'get_' + vhost_list)()
- m = []
- for element in l:
- if isinstance(l, dict):
- m.append((element, l[element], ))
- else:
- m.append((element, ))
- vhost_lists[vhost_list] = m
- logs = []
- for log in vhost.get_logs():
- streams = []
- for stream in log.get_streams():
- filters = stream.get_filters()
- cycle = stream.get_cycle()
- cycle_active = cycle is not None
- if cycle is None:
- cycle = ''
- cycle_gzip = stream.get_cycle_gzip()
- streams.append((stream.get_location(), filters,
- (cycle, cycle_active, ), cycle_gzip,
- stream.custom, stream.custom_attrib, ))
- log_type = log.get_type()
- log_type_enabled = log_type is not None
- if log_type is None:
- log_type = ''
- logs.append((log.get_log_type(), streams,
- (log_type, log_type_enabled, ), log.custom,
- log.custom_attrib, ))
- model.append((getattr(vhost, 'get_' + GUIConfig.vhost_name)(),
- attributes,
- vhost_lists,
- logs,
- vhost.custom,
- vhost.custom_attrib, ))
-
-class VHostTable(gtk.Table):
- def __init__(self, tree):
- gtk.Table.__init__(self, len(GUIConfig.vhost_attributes) +
- 3 * len(GUIConfig.vhost_lists) + 6, 3)
-
- tree.connect('cursor-changed', self.cursor_changed)
- self.last_selected = None
-
- self.attributes = {}
- i = 0
- for attribute in GUIConfig.vhost_attributes: # Add single attributes
- label = gtk.Label(attribute)
- entry = gtk.Entry()
- check = gtk.CheckButton()
- self.attributes[attribute] = (entry, check, )
- self.attach(label, 0, 1, i, i + 1, yoptions = gtk.FILL)
- self.attach(entry, 1, 2, i, i + 1, yoptions = gtk.FILL)
- self.attach(check, 2, 3, i, i + 1, gtk.FILL, gtk.FILL)
- i += 1
-
- self.vhost_lists = {}
- for vhost_list in GUIConfig.vhost_lists: # Add attribute lists
- name = vhost_list[0]
- column_names = []
- columns = []
- defaults = []
- for element in vhost_list[1]:
- column_names.append(element[0])
- columns.append(element[1])
- defaults.append(element[2])
- tree = gtk.TreeView(gtk.ListStore(*(columns)))
- tree_model = tree.get_model()
- def tree_edited_handler(cell, path, text, data):
- model, col_index = data
- model[path][col_index] = text
- col_index = 0
- for column in column_names:
- tree_renderer = gtk.CellRendererText()
- tree_renderer.set_property('editable', True)
- tree_renderer.connect('edited', tree_edited_handler,
- (tree_model, col_index, ))
- tree_column = gtk.TreeViewColumn(column)
- tree_column.pack_start(tree_renderer)
- tree_column.add_attribute(tree_renderer, 'text', col_index)
- tree.append_column(tree_column)
- col_index += 1
- tree_scroll = gtk.ScrolledWindow()
- tree_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- tree_scroll.set_shadow_type(gtk.SHADOW_OUT)
- tree_scroll.set_border_width(5)
- tree_scroll.add(tree)
-
- def add_to_tree(button, data):
- model, defaults = data
- model.append(defaults)
- add_button = gtk.Button('Add')
- add_button.connect('clicked', add_to_tree, (tree_model, defaults,
))
- def remove_from_tree(button, tree):
- model, selected = tree.get_selection().get_selected()
- if selected is not None:
- model.remove(selected)
- remove_button = gtk.Button('Remove')
- remove_button.connect('clicked', remove_from_tree, tree)
-
- self.vhost_lists[name] = tree_model
- self.attach(tree_scroll, 1, 2, i, i + 3)
- self.attach(add_button, 0, 1, i, i + 1, yoptions = gtk.FILL)
- self.attach(remove_button, 0, 1, i + 1, i + 2, yoptions = gtk.FILL)
- self.attach(gtk.Label(), 0, 1, i + 2, i + 3)
- i += 3
-
- # Add logs
- log_type_label = gtk.Label('log type')
- log_type_entry = gtk.Entry()
- log_type_check = gtk.CheckButton()
- self.attach(log_type_label, 0, 1, i + 3, i + 4, yoptions = gtk.FILL)
- self.attach(log_type_entry, 1, 2, i + 3, i + 4, yoptions = gtk.FILL)
- self.attach(log_type_check, 2, 3, i + 3, i + 4, gtk.FILL, gtk.FILL)
-
- cycle_label = gtk.Label('cycle')
- cycle_entry = gtk.SpinButton(gtk.Adjustment(upper = 2 ** 32,
- step_incr = 1))
- cycle_check = gtk.CheckButton()
- cycle_gzip_label = gtk.Label('cycle gzip')
- cycle_gzip_check = gtk.CheckButton()
- self.attach(cycle_label, 0, 1, i + 4, i + 5, yoptions = gtk.FILL)
- self.attach(cycle_entry, 1, 2, i + 4, i + 5, yoptions = gtk.FILL)
- self.attach(cycle_check, 2, 3, i + 4, i + 5, gtk.FILL, gtk.FILL)
- self.attach(cycle_gzip_label, 0, 1, i + 5, i + 6, yoptions = gtk.FILL)
- self.attach(cycle_gzip_check, 2, 3, i + 5, i + 6, gtk.FILL, gtk.FILL)
-
- filter_tree = FilterTreeView()
- stream_tree = StreamTreeView(filter_tree,
- (cycle_entry, cycle_check, ),
- cycle_gzip_check)
- self.log_tree = LogTreeView(stream_tree, (log_type_entry,
- log_type_check, ))
- self.log_model = self.log_tree.get_model()
-
- def add_stream(button, model):
- model.append(('', [], (0, False, ), False, [], {}, ))
- add_stream_button = gtk.Button('Add stream')
- add_stream_button.connect(
- 'clicked', add_stream, stream_tree.get_model())
- def add_filter(button, model):
- model.append(('', ))
- add_filter_button = gtk.Button('Add filter')
- add_filter_button.connect(
- 'clicked', add_filter, filter_tree.get_model())
-
- def remove_selected(button, tree):
- model, selected = tree.get_selection().get_selected()
- if selected is not None:
- model.remove(selected)
- tree.last_selected = None
- remove_stream_button = gtk.Button('Remove stream')
- remove_stream_button.connect('clicked', remove_selected, stream_tree)
- remove_filter_button = gtk.Button('Remove filter')
- remove_filter_button.connect('clicked', remove_selected, filter_tree)
-
- button_grid = gtk.Table(2, 2)
- button_grid.attach(add_stream_button, 0, 1, 0, 1)
- button_grid.attach(add_filter_button, 1, 2, 0, 1)
- button_grid.attach(remove_stream_button, 0, 1, 1, 2)
- button_grid.attach(remove_filter_button, 1, 2, 1, 2)
-
- self.attach(self.log_tree.scroll, 0, 1, i, i + 3)
- self.attach(button_grid, 1, 2, i, i + 1, yoptions = gtk.FILL)
- self.attach(stream_tree.scroll, 1, 2, i + 1, i + 2)
- self.attach(filter_tree.scroll, 1, 2, i + 2, i + 3)
-
- self.scroll = gtk.ScrolledWindow()
- self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- self.scroll.add_with_viewport(self)
-
- def add_log(self):
- '''Add a log to currently selected VHost.'''
- self.log_model.append(('', [], ('', False, ), [], {}, ))
-
- def remove_log(self):
- '''Remove currently selected log.'''
- if self.log_tree.last_selected is not None:
- self.log_model.remove(self.log_tree.last_selected)
- self.log_tree.clear()
-
- def remove_current(self, tree):
- '''Remove currently selected VHost.'''
- if self.last_selected is not None:
- model = tree.get_model()
- model.remove(self.last_selected)
- self.clear()
-
- def clear(self):
- '''Clear input widgets.'''
- for entry, check in self.attributes.itervalues():
- entry.set_text('')
- check.set_active(False)
- for model in self.vhost_lists.itervalues():
- model.clear()
- self.log_tree.clear()
- self.log_tree.get_model().clear()
- self.last_selected = None
-
- def save_changed(self, tree):
- '''Save data from input widgets to model.'''
- if self.last_selected is not None:
- attributes = {}
- for attribute in self.attributes:
- entry, check = self.attributes[attribute]
- attributes[attribute] = (entry.get_text(), check.get_active(),
)
- vhost_lists = {}
- for vhost_list in GUIConfig.vhost_lists:
- container = vhost_lists[vhost_list[0]] = []
- model = self.vhost_lists[vhost_list[0]]
- i = model.iter_children(None)
- while i is not None: # iterate over list elements
- row = []
- for counter in xrange(len(vhost_list[1])):
- row.append(model[i][counter])
- container.append(tuple(row))
- i = model.iter_next(i)
- row = tree.get_model()[self.last_selected]
- row[1] = attributes
- row[2] = vhost_lists
- row[3] = self.log_tree.get_logs()
-
- def cursor_changed(self, tree):
- self.save_changed(tree)
-
- self.clear()
-
- self.last_selected = current = tree.get_selection().get_selected()[1]
- row = tree.get_model()[current]
- for attribute in row[1]:
- entry, check = self.attributes[attribute]
- entry.set_text(row[1][attribute][0])
- check.set_active(row[1][attribute][1])
- for vhost_list in row[2]:
- model = self.vhost_lists[vhost_list]
- for element in row[2][vhost_list]:
- model.append(element)
- self.log_tree.set_logs(row[3])
-
- def make_def(self, tree):
- '''Export all data as list of VHosts.'''
- self.save_changed(tree)
- model = tree.get_model()
- vhosts = []
- i = model.iter_children(None)
- while i is not None: # iterate over VHosts
- row = model[i]
- logs = []
- for log in row[3]:
- streams = []
- for stream in log[1]:
- cycle, enabled = stream[2]
- if not enabled:
- cycle = None
- cycle_gzip = stream[3]
- streams.append(Stream(stream[0], cycle, cycle_gzip,
stream[1]))
- streams[-1].custom = stream[4]
- streams[-1].custom_attrib = stream[5]
- log_type, enabled = log[2]
- if not enabled:
- log_type = None
- logs.append(Log(log[0], streams, log_type))
- logs[-1].custom = log[3]
- logs[-1].custom_attrib = log[4]
- vhost = VHost(row[0], logs = logs)
- for attribute in row[1]:
- text, enabled = row[1][attribute]
- if enabled:
- getattr(vhost, 'set_' + attribute)(text)
- for vhost_list in row[2]:
- for entry in row[2][vhost_list]:
- getattr(vhost, 'add_' + vhost_list)(*entry)
- vhost.custom = row[4]
- vhost.custom_attrib = row[5]
- vhosts.append(vhost)
- i = model.iter_next(i)
- return vhosts
diff --git a/misc/py_control_client/MyServer/GUI/__init__.py
b/misc/py_control_client/MyServer/GUI/__init__.py
deleted file mode 100644
index 8fa2136..0000000
--- a/misc/py_control_client/MyServer/GUI/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-
diff --git a/misc/py_control_client/MyServer/README
b/misc/py_control_client/MyServer/README
deleted file mode 100644
index 6ea5727..0000000
--- a/misc/py_control_client/MyServer/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The py_control_client library implements the client side of the
-CONTROL protocol present in MyServer in the python language.
diff --git a/misc/py_control_client/MyServer/__init__.py
b/misc/py_control_client/MyServer/__init__.py
deleted file mode 100644
index 8fa2136..0000000
--- a/misc/py_control_client/MyServer/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-
diff --git a/misc/py_control_client/MyServer/pycontrol/__init__.py
b/misc/py_control_client/MyServer/pycontrol/__init__.py
deleted file mode 100644
index 8fa2136..0000000
--- a/misc/py_control_client/MyServer/pycontrol/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-
diff --git a/misc/py_control_client/MyServer/pycontrol/pycontrol.py
b/misc/py_control_client/MyServer/pycontrol/pycontrol.py
deleted file mode 100644
index f5224c3..0000000
--- a/misc/py_control_client/MyServer/pycontrol/pycontrol.py
+++ /dev/null
@@ -1,115 +0,0 @@
-'''
-MyServer
-Copyright (C) 2008, 2009 The MyServer Team
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-import socket
-import ssl
-import time
-
-error_codes = {'100': 'CONTROL_OK',
- '200': 'CONTROL_ERROR',
- '201': 'CONTROL_INTERNAL',
- '202': 'CONTROL_AUTH',
- '203': 'CONTROL_MALFORMED',
- '204': 'CONTROL_CMD_NOT_FOUND',
- '205': 'CONTROL_BAD_LEN',
- '206': 'CONTROL_SERVER_BUSY',
- '207': 'CONTROL_BAD_VERSION',
- '208': 'CONTROL_FILE_NOT_FOUND'}
-
-class PyMyServerControl(object):
- def __init__(self, host, port, login, password):
- '''Initialize a connection to server:port using login:password as
- credentials.'''
-
- self.connectionType = "Keep-Alive"
-
- self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.s.connect((host, port))
-
- self.host = host
- self.port = port
- self.login = login
- self.password = password
- self.sock = ssl.wrap_socket(self.s)
-
- def send_header(self, command, length, args = ""):
- '''Build the CONTROL header and send it.'''
- self.buffer = ""
- self.response_values = {}
- self.response_code = None
- req_header = "/" + command + " CONTROL/1.0 " +args + "\r\n"
- req_header = req_header + "/AUTH " + self.login +":" + self.password +
"\r\n"
- req_header = req_header + "/LEN " + str (length) + "\r\n"
- req_header = req_header + "/CONNECTION " + self.connectionType + "\r\n"
- req_header = req_header + "\r\n"
-
- self.sock.write(req_header)
-
- def send(self, data):
- '''Send additional data after the header.'''
- self.sock.write(data)
-
-
- def __readline(self):
- '''Read a line from the socket.'''
- while True:
- self.buffer = self.buffer + self.sock.read(1024)
- ind = self.buffer.find("\r\n")
-
- if ind != 1:
- ret = self.buffer[0:ind]
- self.buffer = self.buffer[ind+2:len(self.buffer)]
- return ret
-
- def available_data(self):
- '''Returns the number of bytes to be read.'''
- return int(self.response_values['LEN']) - self.__bytes_read
-
- def read(self):
- '''Read data that follows the the response header.'''
- if len(self.buffer) > 0:
- self.__bytes_read = self.__bytes_read + len(self.buffer)
- return self.buffer
-
- data = self.sock.read(int(self.response_values['LEN']) -
self.__bytes_read)
- self.__bytes_read = self.__bytes_read + len(data)
-
- return data
-
- def read_header(self):
- '''Read the response header.'''
- self.response_code = self.__readline()[1:4]
- self.__bytes_read = 0
-
- while True:
- line = self.__readline()
- if len(line) == 0:
- break
- ind = line.find(" ")
-
- if ind == -1:
- return
-
- header_name = line[1:ind]
- value = line[ind+1:len(line)]
-
- self.response_values[header_name] = value
-
-
- def close(self):
- '''Close the socket.'''
- del self.sock
- self.s.close()
diff --git a/misc/py_control_client/MyServer/pycontrollib/__init__.py
b/misc/py_control_client/MyServer/pycontrollib/__init__.py
deleted file mode 100644
index 792d600..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/misc/py_control_client/MyServer/pycontrollib/browser.py
b/misc/py_control_client/MyServer/pycontrollib/browser.py
deleted file mode 100644
index 82c0456..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/browser.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import os
-
-class FileBrowser():
- 'Abstract file browser class.'
- def list_dir(self):
- raise NotImplementedError()
-
- def list_files(self):
- raise NotImplementedError()
-
- def get_file(self, path):
- raise NotImplementedError()
-
- def put_file(self, path, text):
- raise NotImplementedError()
-
- def remove_file(self, path):
- raise NotImplementedError()
-
- def get_path(self):
- raise NotImplementedError()
-
- def change_dir(self, path):
- raise NotImplementedError()
-
- def show_hidden(self, show):
- raise NotImplementedError()
-
-class LocalFileBrowser(FileBrowser):
- 'Local file browser class.'
- def __init__(self, path = os.path.expanduser('~')):
- self.path = path
- self.show = False
-
- def list_dir(self):
- return ['..'] + sorted(
- [path for path in os.listdir(self.path) if \
- not os.path.isfile(os.path.join(self.path, path)) \
- and (self.show or not path.startswith('.'))])
-
- def list_files(self):
- return ['..'] + sorted(
- [path for path in os.listdir(self.path) if \
- os.path.isfile(os.path.join(self.path, path)) \
- and (self.show or not path.startswith('.'))])
-
- def get_file(self, path):
- with open(os.path.join(self.path, path)) as f:
- return f.read()
-
- def put_file(self, path, text):
- with open(os.path.join(self.path, path), 'w') as f:
- f.write(text)
-
- def remove_file(self, path):
- os.remove(os.path.join(self.path, path))
-
- def get_path(self):
- return self.path
-
- def change_dir(self, path):
- if path == '..':
- self.path = os.path.split(self.path)[0]
- else:
- self.path = os.path.join(self.path, path)
-
- def show_hidden(self, show):
- self.show = show
diff --git a/misc/py_control_client/MyServer/pycontrollib/config.py
b/misc/py_control_client/MyServer/pycontrollib/config.py
deleted file mode 100644
index cdb5643..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/config.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from lxml import etree
-from definition import Definition, DefinitionList
-
-class MyServerConfig():
- def __init__(self, definitions = []):
- self.definitions = DefinitionList(definitions)
-
- def __eq__(self, other):
- return isinstance(other, MyServerConfig) and \
- self.definitions == other.definitions
-
- def get_definitions(self):
- '''Get current definitions.'''
- return self.definitions.get_definitions()
-
- def add_definition(self, definition, index = None):
- '''Append definition, if index is not None insert it at index-th
- position.'''
- self.definitions.add_definition(definition, index)
-
- def get_definition(self, index):
- '''Get index-th definition.'''
- return self.definitions.get_definition(index)
-
- def remove_definition(self, index):
- '''Remove index-th definition.'''
- self.definitions.remove_definition(index)
-
- @staticmethod
- def from_string(text):
- '''Factory to produce MyServerConfig by parsing a string.'''
- return MyServerConfig.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce MyServerConfig from lxml.etree.Element object.'''
- if root.tag != 'MYSERVER':
- raise AttributeError('Expected MYSERVER tag.')
- return MyServerConfig(map(Definition.from_lxml_element, list(root)))
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- def to_lxml_element(self):
- '''Convert MyServerConfig to lxml.etree.Element object.'''
- root = etree.Element('MYSERVER')
- for definition in self.definitions.get_definitions():
- root.append(definition.to_lxml_element())
- for element in self.definitions.custom:
- root.append(element)
- return root
diff --git a/misc/py_control_client/MyServer/pycontrollib/controller.py
b/misc/py_control_client/MyServer/pycontrollib/controller.py
deleted file mode 100644
index 64cb7c6..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/controller.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from MyServer.pycontrol.pycontrol import PyMyServerControl, error_codes
-from mimetypes import MIMETypes
-from vhost import VHosts
-from config import MyServerConfig
-
-class ServerError(Exception):
- '''Raised when MyServer return code doesn't mean success.'''
- pass
-
-class BasicController():
- def __init__(self, host, port, username, password):
- self.connection = None
- self.host = host
- self.port = int(port)
- self.username = username
- self.password = password
-
- def __check_return_code(self):
- return_code = self.connection.response_code
- if error_codes.get(return_code, '') != 'CONTROL_OK':
- raise ServerError('MyServer returned {0}: {1}'.format(
- return_code, error_codes.get(return_code, '')))
-
- def connect(self):
- '''Connect to server.'''
- self.disconnect()
- self.connection = PyMyServerControl(self.host, self.port,
- self.username, self.password)
-
- def disconnect(self):
- '''Disconnect from server.'''
- if self.connection is not None:
- self.connection.close()
- self.connection = None
-
- def reboot(self):
- '''Reboot server.'''
- if self.connection:
- self.connection.send_header('REBOOT', 0)
- self.connection.read_header()
- self.__check_return_code()
-
- def version(self):
- '''Get version string.'''
- if self.connection:
- self.connection.send_header('VERSION', 0)
- self.connection.read_header()
- self.__check_return_code()
- return self.connection.read()
-
- def enable_reboot(self):
- '''Enable server auto-reboot.'''
- if self.connection:
- self.connection.send_header('ENABLEREBOOT', 0)
- self.connection.read_header()
- self.__check_return_code()
-
- def disable_reboot(self):
- '''Disable server auto-reboot.'''
- if self.connection:
- self.connection.send_header('DISABLEREBOOT', 0)
- self.connection.read_header()
- self.__check_return_code()
-
- def show_connections(self):
- '''List active server connections.'''
- if self.connection:
- self.connection.send_header('SHOWCONNECTIONS', 0)
- self.connection.read_header()
- self.__check_return_code()
- return self.connection.read()
-
- def kill_connection(self, num):
- '''Kill connection to server.'''
- if self.connection:
- self.connection.send_header('KILLCONNECTION', 0, str(num))
- self.connection.read_header()
- self.__check_return_code()
-
- def show_language_files(self):
- '''List available language files.'''
- if self.connection:
- self.connection.send_header('SHOWLANGUAGEFILES', 0)
- self.connection.read_header()
- self.__check_return_code()
- return self.connection.read()
-
- def get_file(self, path):
- '''Get file from server.'''
- if self.connection:
- self.connection.send_header('GETFILE', 0, path)
- self.connection.read_header()
- self.__check_return_code()
- return self.connection.read()
-
- def put_file(self, text, path):
- '''Put file to server.'''
- if self.connection:
- self.connection.send_header('PUTFILE', len(text), path)
- self.connection.send(text)
- self.connection.read_header()
- self.__check_return_code()
-
-class Controller(BasicController):
- def get_MIME_type_configuration(self):
- '''Get MIME types settings.'''
- return MIMETypes.from_string(self.get_file('mimetypes.xml'))
-
- def get_vhost_configuration(self):
- '''Get VHosts settings.'''
- return VHosts.from_string(self.get_file('virtualhosts.xml'))
-
- def get_server_configuration(self):
- '''Get server settings.'''
- return MyServerConfig.from_string(self.get_file('myserver.xml'))
-
- def put_MIME_type_configuration(self, config):
- '''Put MIME types settings.'''
- self.put_file(str(config), 'mimetypes.xml')
-
- def put_vhost_configuration(self, config):
- '''Put VHost settings.'''
- self.put_file(str(config), 'virtualhosts.xml')
-
- def put_server_configuration(self, config):
- '''Put server settings.'''
- self.put_file(str(config), 'myserver.xml')
diff --git a/misc/py_control_client/MyServer/pycontrollib/definition.py
b/misc/py_control_client/MyServer/pycontrollib/definition.py
deleted file mode 100644
index 9ac2f55..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/definition.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from lxml import etree
-
-class Definition():
- '''Common interface for DefinitionElement and DefinitionTree. Objects of
- this type should not exist alone.'''
-
- def __init__(self, name = None, attributes = {}):
- '''Creates new definition with given name and attributes.'''
- self.set_name(name)
- self.attributes = {}
- for key, value in attributes.iteritems():
- self.set_attribute(key, value)
-
- def __eq__(self, other):
- return isinstance(other, Definition) and \
- self.name == other.name and \
- self.attributes == other.attributes
-
- def get_name(self):
- '''Definition name, None means no name.'''
- return self.name
-
- def set_name(self, name):
- '''Set definition name, None means no name.'''
- self.name = name
-
- def get_attributes(self):
- '''Get dict of all attributes.'''
- return self.attributes
-
- def get_attribute(self, key):
- '''Get value of attribute key.'''
- return self.attributes[key]
-
- def set_attribute(self, key, value):
- '''Set attribute key to given value.'''
- if key == 'value':
- raise KeyError('value is not an allowed key')
- self.attributes[key] = value
-
- def remove_attribute(self, key):
- '''Remove attribute key.'''
- self.attributes.pop(key)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce definition element or tree from
lxml.etree.Element
- object.'''
- if root.tag != 'DEFINE': # don't touch unknown things
- return root
- if len(list(root)):
- return DefinitionTree.from_lxml_element(root)
- else:
- return DefinitionElement.from_lxml_element(root)
-
- @staticmethod
- def from_string(text):
- '''Factory to produce definition element or tree by parsing a
string.'''
- return Definition.from_lxml_element(etree.XML(text))
-
-class DefinitionElement(Definition):
- '''Single definition element.'''
-
- def __init__(self, name = None, attributes = {}):
- '''Creates new definition element with given name and attributes.'''
- Definition.__init__(self, name)
- self.tag = 'DEFINE element'
- for key, value in attributes.iteritems():
- self.set_attribute(key, value)
-
- def __eq__(self, other):
- return isinstance(other, DefinitionElement) and \
- Definition.__eq__(self, other)
-
- def set_attribute(self, key, value):
- '''Set attribute key to given value.'''
- if key == 'value':
- self.attributes['value'] = value
- else:
- Definition.set_attribute(self, key, value)
-
- def to_lxml_element(self):
- '''Convert definition element to lxml.etree.Element object.'''
- root = etree.Element('DEFINE')
- for key, value in self.attributes.iteritems():
- root.set(key, value)
- if self.name is not None:
- root.set('name', self.name)
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce definition element from lxml.etree.Element
- object.'''
- if root.tag != 'DEFINE':
- raise AttributeError('Expected DEFINE tag.')
- attributes = root.attrib
- name = attributes.pop('name', None)
- return DefinitionElement(name, attributes)
-
- @staticmethod
- def from_string(text):
- '''Factory to produce definition element by parsing a string.'''
- return DefinitionElement.from_lxml_element(etree.XML(text))
-
- def search_by_name(self, name):
- return None if name != self.name else self
-
-class DefinitionTree(Definition):
- '''Definition element containing other definitions.'''
-
- def __init__(self, name = None, definitions = [], attributes = {}):
- '''Creates new definition tree with given name, sub-definitions and
- attributes. values is expected to be iterable.'''
- Definition.__init__(self, name, attributes)
- self.tag = 'DEFINE tree'
- self.definitions = []
- self.custom = [] # list of children not being definitions
- for definition in definitions:
- self.add_definition(definition)
-
- def __eq__(self, other):
- return isinstance(other, DefinitionTree) and \
- Definition.__eq__(self, other) and \
- self.definitions == other.definitions
-
- def get_definitions(self):
- '''Get all sub-definitions.'''
- return self.definitions
-
- def get_definition(self, index):
- '''Get sub-definition with given index.'''
- return self.definitions[index]
-
- def add_definition(self, value, index = None):
- '''Add value to sub-definitions, either at given position, or at the
- end.'''
- if not isinstance(value, Definition):
- self.custom.append(value)
- else:
- if index is None:
- self.definitions.append(value)
- else:
- self.definitions.insert(index, value)
-
- def remove_definition(self, index):
- '''Remove sub-definition with given index.'''
- self.definitions.pop(index)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce definition tree from lxml.etree.Element
object.'''
- if root.tag != 'DEFINE':
- raise AttributeError('Expected DEFINE tag.')
- attributes = root.attrib
- name = attributes.pop('name', None)
- definitions = map(Definition.from_lxml_element, list(root))
- return DefinitionTree(name, definitions, attributes)
-
- @staticmethod
- def from_string(text):
- '''Factory to produce definition tree by parsing a string.'''
- return DefinitionTree.from_lxml_element(etree.XML(text))
-
- def to_lxml_element(self):
- '''Convert definition tree to lxml.etree.Element object.'''
- root = etree.Element('DEFINE')
- for key, value in self.attributes.iteritems():
- root.set(key, value)
- if self.name is not None:
- root.set('name', self.name)
- for definition in self.definitions:
- root.append(definition.to_lxml_element())
- for element in self.custom:
- root.append(element)
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- def search_by_name(self, name):
- for definition in reversed(self.definitions):
- ret = definition.search_by_name(name)
- if ret != None:
- return ret
- return None if name != self.name else self
-
-class DefinitionList():
- def __init__(self, definitions = []):
- '''Construct new DefinitionList object with given definitions.'''
- self.definitions = []
- self.custom = []
- for definition in definitions:
- self.add_definition(definition)
-
- def add_definition(self, definition, index = None):
- '''Append definition to current list of definitions, if index is not
- None insert at index-th position.'''
- if not isinstance(definition, Definition):
- self.custom.append(definition)
- else:
- if index is None:
- self.definitions.append(definition)
- else:
- self.definitions.insert(index, definition)
-
- def get_definitions(self):
- '''Get current list of definitions.'''
- return self.definitions
-
- def get_definition(self, index):
- '''Get index-th definition.'''
- return self.definitions[index]
-
- def remove_definition(self, index):
- '''Remove index-th definition.'''
- self.definitions.pop(index)
-
- def __eq__(self, other):
- return isinstance(other, DefinitionList) and \
- self.definitions == other.definitions
-
- def __str__(self):
- return '\n'.join(map(str, self.definitions))
-
- def search_by_name(self, name):
- for definition in reversed(self.definitions):
- ret = definition.search_by_name(name)
- if ret != None:
- return ret
- return None
diff --git a/misc/py_control_client/MyServer/pycontrollib/log.py
b/misc/py_control_client/MyServer/pycontrollib/log.py
deleted file mode 100644
index 8752f1b..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/log.py
+++ /dev/null
@@ -1,242 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from lxml import etree
-
-class Stream():
- def __init__(self, location = None, cycle = None, cycle_gzip = None,
filters = []):
- '''Create new Stream instance. filter is expected to be iterable.'''
- self.set_location(location)
- self.set_cycle(cycle)
- self.set_cycle_gzip(cycle_gzip)
- self.filters = []
- for filter in filters:
- self.add_filter(filter)
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, Stream) and \
- self.location == other.location and \
- self.cycle == other.cycle and \
- self.cycle_gzip == other.cycle_gzip and \
- self.filters == other.filters
-
- def get_location(self):
- '''Get stream location.'''
- return self.location
-
- def set_location(self, location):
- '''Set stream location.'''
- self.location = location
-
- def get_cycle(self):
- '''Get stream cycle value.'''
- return self.cycle
-
- def set_cycle(self, cycle):
- '''Set cycle value, None means not set.'''
- if cycle is not None:
- self.cycle = int(cycle)
- else:
- self.cycle = cycle
-
- def get_cycle_gzip(self):
- '''Get stream cycle_gzip value.'''
- return self.cycle_gzip
-
- def set_cycle_gzip(self, cycle_gzip):
- '''Set stream cycle_gzip value, None means not set'''
- self.cycle_gzip = cycle_gzip
-
- def get_filters(self):
- '''Get list of stream filters.'''
- return self.filters
-
- def get_filter(self, index):
- '''Get index-th filter.'''
- return self.filters[index]
-
- def add_filter(self, filter, index = None):
- '''Append a new filter, or insert it at index position.'''
- if index is None:
- self.filters.append(filter)
- else:
- self.filters.insert(index, filter)
-
- def remove_filter(self, index):
- '''Remove index-th filter.'''
- self.filters.pop(index)
-
- @staticmethod
- def from_string(text):
- '''Factory to produce stream by parsing a string.'''
- return Stream.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce stream from lxml.etree.Element object.'''
- if root.tag != 'STREAM':
- raise AttributeError('Expected STREAM tag.')
- known_attrib = set(['location', 'cycle', 'cycle_gzip'])
- custom_attrib = {}
- for key, value in root.attrib.iteritems():
- if key not in known_attrib:
- custom_attrib[key] = value
- location = root.get('location')
- cycle = root.get('cycle', None)
- cycle_gzip = root.get('cycle_gzip', None)
- if cycle_gzip is not None:
- cycle_gzip = cycle_gzip.upper() == 'YES'
- filters = []
- custom = []
- for child in list(root):
- if child.tag == 'FILTER':
- filters.append(child.text)
- else:
- custom.append(child)
- stream = Stream(location, cycle, cycle_gzip, filters)
- stream.custom = custom
- stream.custom_attrib = custom_attrib
- return stream
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- def to_lxml_element(self):
- '''Convert to lxml.etree.Element.'''
- root = etree.Element('STREAM')
- if self.location is not None:
- root.set('location', self.location)
- if self.cycle is not None:
- root.set('cycle', str(self.cycle))
- if self.cycle_gzip is not None:
- root.set('cycle_gzip', 'YES' if self.cycle_gzip else 'NO')
- for filter in self.filters:
- element = etree.Element('FILTER')
- element.text = filter
- root.append(element)
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
-
-class Log():
- def __init__(self, log_type, streams = [], type = None):
- '''Create new Log instance. stream is expected to be iterable.'''
- self.set_log_type(log_type)
- self.set_type(type)
- self.streams = []
- for stream in streams:
- self.add_stream(stream)
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, Log) and \
- self.log_type == other.log_type and \
- self.streams == other.streams and \
- self.type == other.type
-
- def get_type(self):
- '''Get log's type attribute.'''
- return self.type
-
- def set_type(self, type):
- '''Set log's type attribute, None means not set'''
- self.type = type
-
- def get_log_type(self):
- '''Get log's type.'''
- return self.log_type
-
- def set_log_type(self, log_type):
- '''Set log's type.'''
- if log_type is None:
- raise AttributeError('log_type is required and can\'t be None')
- self.log_type = log_type
-
- def get_streams(self):
- '''Get streams associated with this log.'''
- return self.streams
-
- def add_stream(self, stream, index = None):
- '''Append stream to current streams or if index is not None insert
- stream ad index-th position.'''
- if index is None:
- self.streams.append(stream)
- else:
- self.streams.insert(index, stream)
-
- def remove_stream(self, index):
- '''Remove stream from index-th position.'''
- self.streams.pop(index)
-
- def get_stream(self, index):
- '''Get index-th stream.'''
- return self.streams[index]
-
- @staticmethod
- def from_string(text):
- '''Factory to produce log by parsing a string.'''
- return Log.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce log from lxml.etree.Element object.'''
- log_type = root.tag
- custom_attrib = {}
- known_attrib = set(['type'])
- for key, value in root.attrib.iteritems():
- if key not in known_attrib:
- custom_attrib[key] = value
- type = root.get('type', None)
- streams = []
- custom = []
- for element in list(root):
- try:
- streams.append(Stream.from_lxml_element(element))
- except AttributeError:
- custom.append(element)
- log = Log(log_type, streams, type)
- log.custom = custom
- log.custom_attrib = custom_attrib
- return log
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- def to_lxml_element(self):
- '''Convert to lxml.etree.Element.'''
- root = etree.Element(self.log_type)
- if self.type is not None:
- root.set('type', self.type)
- for stream in self.streams:
- root.append(stream.to_lxml_element())
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
diff --git a/misc/py_control_client/MyServer/pycontrollib/mimetypes.py
b/misc/py_control_client/MyServer/pycontrollib/mimetypes.py
deleted file mode 100644
index df978c2..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/mimetypes.py
+++ /dev/null
@@ -1,270 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from definition import Definition, DefinitionList
-from lxml import etree
-
-class MIMEType():
- def __init__(self, mime, handler = None, param = None, extensions = [],
- path = None, filters = [], self_executed = None,
- definitions = []):
- '''Creates new MIMEType with specified attributes. extension, filter
and
- definitions are expected to be iterable.'''
- self.set_mime(mime)
- self.set_handler(handler)
- self.set_param(param)
- self.extensions = set()
- for extension in extensions:
- self.add_extension(extension)
- self.set_path(path)
- self.filters = []
- for filter in filters:
- self.add_filter(filter)
- self.set_self_executed(self_executed)
- self.definitions = DefinitionList(definitions)
- self.custom = []
- self.custom_attrib = {}
-
- def get_mime(self):
- '''Get associated mime type.'''
- return self.mime
-
- def set_mime(self, mime):
- '''Set associated mime type.'''
- if mime is None:
- raise AttributeError('mime is required and can\'t be None')
- self.mime = mime
-
- def get_handler(self):
- '''Get associated handler.'''
- return self.handler
-
- def set_handler(self, handler):
- '''Set associated handler.'''
- self.handler = handler
-
- def get_param(self):
- '''Get associated param.'''
- return self.param
-
- def set_param(self, param):
- '''Set associated param. None means no param.'''
- self.param = param
-
- def get_extensions(self):
- '''Get associated extensions.'''
- return self.extensions
-
- def remove_extension(self, extension):
- '''Remove extension from associated extensions.'''
- self.extensions.remove(extension)
-
- def add_extension(self, extension):
- '''Add extension to associated extensions.'''
- self.extensions.add(extension)
-
- def get_path(self):
- '''Get associated path.'''
- return self.path
-
- def set_path(self, path):
- '''Set associated path. None means no path.'''
- self.path = path
-
- def get_filters(self):
- '''Get associated filters.'''
- return self.filters
-
- def get_filter(self, index):
- '''Get filter with given index.'''
- return self.filters[index]
-
- def remove_filter(self, index):
- '''Remove filter with given index.'''
- self.filters.pop(index)
-
- def add_filter(self, filter, index = None):
- '''Append filter after all other filters, or insert it at index.'''
- if index is None:
- self.filters.append(filter)
- else:
- self.filters.insert(index, filter)
-
- def get_self_executed(self):
- '''Get self_executed setting.'''
- return self.self_executed
-
- def set_self_executed(self, self_executed):
- '''Set self_executed setting.'''
- self.self_executed = self_executed
-
- def get_definitions(self):
- '''Get all definitions.'''
- return self.definitions.get_definitions()
-
- def get_definition(self, index):
- '''Get definition with given index.'''
- return self.definitions.get_definition(index)
-
- def add_definition(self, definition, index = None):
- '''Append definition after all other definitions, or insert it at
- index.'''
- self.definitions.add_definition(definition, index)
-
- def remove_definition(self, index):
- '''Remove definition with given index.'''
- self.definitions.remove_definition(index)
-
- def __eq__(self, other):
- return isinstance(other, MIMEType) and \
- self.mime == other.mime and \
- self.handler == other.handler and \
- self.param == other.param and \
- self.extensions == other.extensions and \
- self.path == other.path and \
- self.filters == other.filters and \
- self.self_executed == other.self_executed and \
- self.definitions == other.definitions
-
- def to_lxml_element(self):
- '''Convert to lxml.etree.Element.'''
- def make_element(tag, attribute, value):
- element = etree.Element(tag)
- element.set(attribute, value)
- return element
- def make_extension_element(extension):
- return make_element('EXTENSION', 'value', extension)
- def make_filter_element(filter):
- return make_element('FILTER', 'value', filter)
- root = etree.Element('MIME')
- root.set('mime', self.mime)
- if self.handler is not None:
- root.set('handler', self.handler)
- if self.param is not None:
- root.set('param', self.param)
- if self.self_executed is not None:
- root.set('self', self.self_executed)
- if self.path is not None:
- root.append(make_element('PATH', 'regex', self.path))
- for element in map(make_extension_element, self.extensions):
- root.append(element)
- for element in map(make_filter_element, self.filters):
- root.append(element)
- for definition in self.definitions.get_definitions():
- root.append(definition.to_lxml_element())
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce MIMEType from lxml.etree.Element object.'''
- if root.tag != 'MIME':
- raise AttributeError('Expected MIME tag.')
- mime = root.get('mime', None)
- handler = root.get('handler', None)
- param = root.get('param', None)
- self_executed = root.get('self', None)
- known_attrib = set(['mime', 'handler', 'param', 'self'])
- custom_attrib = {}
- for key, value in root.attrib.iteritems():
- if key not in known_attrib:
- custom_attrib[key] = value
- path = None
- extension = set()
- filters = []
- definitions = []
- custom = []
- for child in list(root):
- if child.tag == 'PATH':
- path = child.get('regex')
- elif child.tag == 'FILTER':
- filters.append(child.get('value'))
- elif child.tag == 'EXTENSION':
- extension.add(child.get('value'))
- elif child.tag == 'DEFINE':
- definitions.append(Definition.from_lxml_element(child))
- else:
- custom.append(child)
- mime = MIMEType(mime, handler, param, extension, path, filters,
- self_executed, definitions)
- mime.custom = custom
- mime.custom_attrib = custom_attrib
- return mime
-
- @staticmethod
- def from_string(text):
- '''Factory to produce MIMEType by parsing a string.'''
- return MIMEType.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
-
-class MIMETypes():
- def __init__(self, MIME_types = []):
- self.MIME_types = MIME_types
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, MIMETypes) and \
- self.MIME_types == other.MIME_types
-
- def to_lxml_element(self):
- '''Convert to lxml.etree.Element.'''
- root = etree.Element('MIMES')
- for mime in self.MIME_types:
- root.append(mime.to_lxml_element())
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce MIMETypes from lxml.etree.Element object.'''
- if root.tag != 'MIMES':
- raise AttributeError('Expected MIMES tag.')
- types = []
- custom = []
- for element in list(root):
- try:
- types.append(MIMEType.from_lxml_element(element))
- except AttributeError:
- custom.append(element)
- mimes = MIMETypes(types)
- mimes.custom = custom
- mimes.custom_attrib = root.attrib
- return mimes
-
- @staticmethod
- def from_string(text):
- '''Factory to produce MIMETypes from parsing a string.'''
- return MIMETypes.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
diff --git a/misc/py_control_client/MyServer/pycontrollib/security.py
b/misc/py_control_client/MyServer/pycontrollib/security.py
deleted file mode 100644
index 74e0dc1..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/security.py
+++ /dev/null
@@ -1,474 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from lxml import etree
-from definition import Definition
-
-class SecurityElement():
- @staticmethod
- def from_lxml_element(root):
- if root.tag == 'USER':
- return User.from_lxml_element(root)
- if root.tag == 'CONDITION':
- return Condition.from_lxml_element(root)
- elif root.tag == 'PERMISSION':
- return Permission.from_lxml_element(root)
- elif root.tag == 'RETURN':
- return Return.from_lxml_element(root)
- elif root.tag == 'DEFINE':
- return Definition.from_lxml_element(root)
- else:
- raise AttributeError(
- '{0} is not allowed in security files'.format(root.tag))
-
- @staticmethod
- def from_string(text):
- '''Factory to produce security element by parsing a string.'''
- return SecurityElement.from_lxml_element(etree.XML(text))
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
-class Condition(SecurityElement):
- def __init__(self, name = None, value = None, reverse = None, regex = None,
- sub_elements = []):
- self.tag = 'CONDITION'
- self.set_name(name)
- self.set_value(value)
- self.set_reverse(reverse)
- self.set_regex(regex)
- self.custom_attrib = {}
- self.custom = []
- self.sub_elements = []
- for element in sub_elements:
- self.add_sub_element(element)
-
- def __eq__(self, other):
- return isinstance(other, Condition) and self.name == other.name and \
- self.value == other.value and self.reverse == other.reverse and \
- self.regex == other.regex and \
- self.sub_elements == other.sub_elements
-
- def set_name(self, name):
- self.name = name
-
- def get_name(self):
- return self.name
-
- def set_value(self, value):
- self.value = value
-
- def get_value(self):
- return self.value
-
- def set_reverse(self, reverse):
- self.reverse = reverse
-
- def get_reverse(self):
- return self.reverse
-
- def set_regex(self, regex):
- self.regex = regex
-
- def get_regex(self):
- return self.regex
-
- def add_sub_element(self, element, index = None):
- if isinstance(element, Definition) or \
- isinstance(element, SecurityElement):
- if index is None:
- self.sub_elements.append(element)
- else:
- self.sub_elements.insert(index, element)
- else:
- self.custom.append(element)
-
- def get_sub_elements(self):
- return self.sub_elements
-
- def get_sub_element(self, index):
- return self.sub_elements[index]
-
- def remove_sub_element(self, index):
- self.sub_elements.pop(index)
-
- def to_lxml_element(self):
- root = etree.Element('CONDITION')
- if self.name is not None:
- root.set('name', self.name)
- if self.value is not None:
- root.set('value', self.value)
- if self.reverse is not None:
- root.set('not', 'yes' if self.reverse else 'no')
- if self.regex is not None:
- root.set('regex', 'yes' if self.regex else 'no')
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
- for element in self.sub_elements:
- root.append(element.to_lxml_element())
- for element in self.custom:
- root.append(element)
- return root
-
- @staticmethod
- def from_lxml_element(root):
- if root.tag != 'CONDITION':
- raise AttributeError('Expected CONDITION tag.')
- custom_attrib = root.attrib
- name = custom_attrib.pop('name', None)
- value = custom_attrib.pop('value', None)
- reverse = custom_attrib.pop('not', None)
- if reverse is not None:
- reverse = reverse.upper() == 'YES'
- regex = custom_attrib.pop('regex', None)
- if regex is not None:
- regex = regex.upper() == 'YES'
- custom = []
- sub_elements = []
- for child in list(root):
- try:
- sub_elements.append(SecurityElement.from_lxml_element(child))
- except:
- custom.append(child)
- condition = Condition(name, value, reverse, regex, sub_elements)
- condition.custom = custom
- condition.custom_attrib = custom_attrib
- return condition
-
- @staticmethod
- def from_string(text):
- '''Factory to produce condition element by parsing a string.'''
- return Condition.from_lxml_element(etree.XML(text))
-
-class Permission(SecurityElement):
- def __init__(self, read = None, execute = None, browse = None,
- delete = None, write = None):
- self.tag = 'PERMISSION'
- self.set_read(read)
- self.set_execute(execute)
- self.set_browse(browse)
- self.set_delete(delete)
- self.set_write(write)
- self.custom_attrib = {}
- self.custom = []
-
- def __eq__(self, other):
- return isinstance(other, Permission) and self.read == other.read and \
- self.execute == other.execute and self.browse == other.browse and \
- self.delete == other.delete and self.write == other.write
-
- def set_read(self, read):
- self.read = read
-
- def get_read(self):
- return self.read
-
- def set_execute(self, execute):
- self.execute = execute
-
- def get_execute(self):
- return self.execute
-
- def set_browse(self, browse):
- self.browse = browse
-
- def get_browse(self):
- return self.browse
-
- def set_delete(self, delete):
- self.delete = delete
-
- def get_delete(self):
- return self.delete
-
- def set_write(self, write):
- self.write = write
-
- def get_write(self):
- return self.write
-
- def to_lxml_element(self):
- root = etree.Element('PERMISSION')
- if self.read is not None:
- root.set('READ', 'YES' if self.read else 'NO')
- if self.execute is not None:
- root.set('EXECUTE', 'YES' if self.execute else 'NO')
- if self.browse is not None:
- root.set('BROWSE', 'YES' if self.browse else 'NO')
- if self.delete is not None:
- root.set('DELETE', 'YES' if self.delete else 'NO')
- if self.write is not None:
- root.set('WRITE', 'YES' if self.write else 'NO')
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
- for element in self.custom:
- root.append(element)
- return root
-
- @staticmethod
- def from_lxml_element(root):
- if root.tag != 'PERMISSION':
- raise AttributeError('Expected PERMISSION tag.')
- custom_attrib = root.attrib
- read = custom_attrib.pop('READ', None)
- if read is not None:
- read = read.upper() == 'YES'
- execute = custom_attrib.pop('EXECUTE', None)
- if execute is not None:
- execute = execute.upper() == 'YES'
- browse = custom_attrib.pop('BROWSE', None)
- if browse is not None:
- browse = browse.upper() == 'YES'
- delete = custom_attrib.pop('DELETE', None)
- if delete is not None:
- delete = delete.upper() == 'YES'
- write = custom_attrib.pop('WRITE', None)
- if write is not None:
- write = write.upper() == 'YES'
- custom = list(root)
- permission = Permission(read, execute, browse, delete, write)
- permission.custom_attrib = custom_attrib
- permission.custom = custom
- return permission
-
- @staticmethod
- def from_string(text):
- '''Factory to produce permission element by parsing a string.'''
- return Permission.from_lxml_element(etree.XML(text))
-
-class User(SecurityElement):
- def __init__(self, name = None, password = None, read = None,
- execute = None, browse = None, delete = None, write = None):
- self.tag = 'USER'
- self.set_name(name)
- self.set_password(password)
- self.set_read(read)
- self.set_execute(execute)
- self.set_browse(browse)
- self.set_delete(delete)
- self.set_write(write)
- self.custom_attrib = {}
- self.custom = []
-
- def __eq__(self, other):
- return isinstance(other, User) and self.name == other.name and \
- self.password == other.password and self.read == other.read and \
- self.execute == other.execute and self.browse == other.browse and \
- self.delete == other.delete and self.write == other.write
-
- def set_name(self, name):
- self.name = name
-
- def get_name(self):
- return self.name
-
- def set_password(self, password):
- self.password = password
-
- def get_password(self):
- return self.password
-
- def set_read(self, read):
- self.read = read
-
- def get_read(self):
- return self.read
-
- def set_execute(self, execute):
- self.execute = execute
-
- def get_execute(self):
- return self.execute
-
- def set_browse(self, browse):
- self.browse = browse
-
- def get_browse(self):
- return self.browse
-
- def set_delete(self, delete):
- self.delete = delete
-
- def get_delete(self):
- return self.delete
-
- def set_write(self, write):
- self.write = write
-
- def get_write(self):
- return self.write
-
- def to_lxml_element(self):
- root = etree.Element('USER')
- if self.name is not None:
- root.set('name', self.name)
- if self.password is not None:
- root.set('password', self.password)
- if self.read is not None:
- root.set('READ', 'YES' if self.read else 'NO')
- if self.execute is not None:
- root.set('EXECUTE', 'YES' if self.execute else 'NO')
- if self.browse is not None:
- root.set('BROWSE', 'YES' if self.browse else 'NO')
- if self.delete is not None:
- root.set('DELETE', 'YES' if self.delete else 'NO')
- if self.write is not None:
- root.set('WRITE', 'YES' if self.write else 'NO')
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
- for element in self.custom:
- root.append(element)
- return root
-
- @staticmethod
- def from_lxml_element(root):
- if root.tag != 'USER':
- raise AttributeError('Expected USER tag.')
- custom_attrib = root.attrib
- name = custom_attrib.pop('name', None)
- password = custom_attrib.pop('password', None)
- read = custom_attrib.pop('READ', None)
- if read is not None:
- read = read.upper() == 'YES'
- execute = custom_attrib.pop('EXECUTE', None)
- if execute is not None:
- execute = execute.upper() == 'YES'
- browse = custom_attrib.pop('BROWSE', None)
- if browse is not None:
- browse = browse.upper() == 'YES'
- delete = custom_attrib.pop('DELETE', None)
- if delete is not None:
- delete = delete.upper() == 'YES'
- write = custom_attrib.pop('WRITE', None)
- if write is not None:
- write = write.upper() == 'YES'
- custom = list(root)
- user = User(name, password, read, execute, browse,
- delete, write)
- user.custom_attrib = custom_attrib
- user.custom = custom
- return user
-
- @staticmethod
- def from_string(text):
- '''Factory to produce user element by parsing a string.'''
- return User.from_lxml_element(etree.XML(text))
-
-class Return(SecurityElement):
- def __init__(self, value = None):
- self.tag = 'RETURN'
- self.set_value(value)
- self.custom_attrib = {}
- self.custom = []
-
- def __eq__(self, other):
- return isinstance(other, Return) and self.value == other.value
-
- def set_value(self, value):
- self.value = value
-
- def get_value(self):
- return self.value
-
- def to_lxml_element(self):
- root = etree.Element('RETURN')
- if self.value is not None:
- root.set('value', self.value)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
- for element in self.custom:
- root.append(element)
- return root
-
- @staticmethod
- def from_lxml_element(root):
- if root.tag != 'RETURN':
- raise AttributeError('Expected RETURN tag.')
- custom_attrib = root.attrib
- value = custom_attrib.pop('value', None)
- custom = list(root)
- ret = Return(value)
- ret.custom_attrib = custom_attrib
- ret.custom = custom
- return ret
-
- @staticmethod
- def from_string(text):
- '''Factory to produce return element by parsing a string.'''
- return Return.from_lxml_element(etree.XML(text))
-
-class SecurityList():
- def __init__(self, elements = []):
- self.elements = []
- for element in elements:
- self.add_element(element)
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, SecurityList) and \
- self.elements == other.elements
-
- def get_elements(self):
- return self.elements
-
- def get_element(self, index):
- return self.elements[index]
-
- def add_element(self, element, index = None):
- if index is None:
- self.elements.append(element)
- else:
- self.elements.insert(index, element)
-
- def remove_element(self, index):
- self.elements.pop(index)
-
- @staticmethod
- def from_lxml_element(root):
- if root.tag != 'SECURITY':
- raise AttributeError('Expected SECURITY tag.')
- elements = []
- custom = []
- for element in list(root):
- try:
- elements.append(SecurityElement.from_lxml_element(element))
- except:
- custom.append(element)
- security_list = SecurityList(elements)
- security_list.custom = custom
- security_list.custom_attrib = root.attrib
- return security_list
-
- @staticmethod
- def from_string(text):
- '''Factory to produce security list by parsing a string.'''
- return SecurityList.from_lxml_element(etree.XML(text))
-
- def to_lxml_element(self):
- root = etree.Element('SECURITY')
- for element in self.elements:
- root.append(element.to_lxml_element())
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
- for element in self.custom:
- root.append(element)
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
diff --git a/misc/py_control_client/MyServer/pycontrollib/test/Makefile
b/misc/py_control_client/MyServer/pycontrollib/test/Makefile
deleted file mode 100644
index 7c7179e..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# MyServer
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-PYTHON=/usr/bin/python
-PYTHONPATH:=$(shell dirname `pwd`):${PYTHONPATH}
-
-.PHONY: test log_test definition_test mimetypes_test vhost_test config_test \
- security_test
-
-test: log_test definition_test mimetypes_test vhost_test config_test \
- security_test
-
-log_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} log_test.py
-
-definition_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} definition_test.py
-
-mimetypes_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} mimetypes_test.py
-
-vhost_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} vhost_test.py
-
-config_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} config_test.py
-
-security_test:
- -PYTHONPATH=${PYTHONPATH} ${PYTHON} security_test.py
-
-.PHONY: clean
-clean:
- rm *.py[co]
diff --git a/misc/py_control_client/MyServer/pycontrollib/test/config_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/config_test.py
deleted file mode 100644
index 1f40262..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/config_test.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import unittest
-from lxml import etree
-from config import MyServerConfig
-from definition import DefinitionElement, DefinitionTree
-
-class MyServerConfigTest(unittest.TestCase):
- def setUp(self):
- self.definitions = []
- self.definitions.append(DefinitionElement('a'))
- self.definitions.append(DefinitionElement('b'))
- self.definitions.append(DefinitionElement('c'))
-
- def test_creation(self):
- config = MyServerConfig()
- config = MyServerConfig(self.definitions)
-
- def test_definitions(self):
- config = MyServerConfig()
- self.assertEqual([], config.get_definitions())
- counter = 0
- for definition in self.definitions:
- config.add_definition(definition)
- counter += 1
- self.assertEqual(self.definitions[:counter],
- config.get_definitions())
- for counter in xrange(len(self.definitions)):
- self.assertEqual(self.definitions[counter],
- config.get_definition(counter))
- config.add_definition(DefinitionElement('test'), 1)
- self.assertEqual(DefinitionElement('test'), config.get_definition(1))
- config.remove_definition(1)
- self.assertEqual(self.definitions, config.get_definitions())
- for counter in xrange(len(self.definitions)):
- config.remove_definition(0)
- self.assertEqual(self.definitions[counter + 1:],
- config.get_definitions())
-
- def test_equality(self):
- self.assertEqual(MyServerConfig(self.definitions),
- MyServerConfig(self.definitions))
- self.assertNotEqual(MyServerConfig(), MyServerConfig(self.definitions))
- self.assertNotEqual(MyServerConfig(), 'other type')
-
- def test_from_string(self):
- text = '<MYSERVER />'
- config = MyServerConfig.from_string(text)
- right = MyServerConfig()
- self.assertEqual(config, right)
-
- def test_from_string_definitions(self):
- text = '''<MYSERVER>
- <DEFINE name="a" />
- <DEFINE>
- <DEFINE name="b" />
- <DEFINE name="c" />
- </DEFINE>
-</MYSERVER>'''
- config = MyServerConfig.from_string(text)
- right = MyServerConfig([DefinitionElement('a'), DefinitionTree(
- definitions = [DefinitionElement('b'),
- DefinitionElement('c')])])
- self.assertEqual(config, right)
-
- def test_from_lxml(self):
- text = '<MYSERVER />'
- config = MyServerConfig.from_lxml_element(etree.XML(text))
- right = MyServerConfig()
- self.assertEqual(config, right)
-
- def test_from_lxml_definitions(self):
- text = '''<MYSERVER>
- <DEFINE name="a" />
- <DEFINE>
- <DEFINE name="b" />
- <DEFINE name="c" />
- </DEFINE>
-</MYSERVER>'''
- config = MyServerConfig.from_lxml_element(etree.XML(text))
- right = MyServerConfig([DefinitionElement('a'), DefinitionTree(
- definitions = [DefinitionElement('b'),
- DefinitionElement('c')])])
- self.assertEqual(config, right)
-
- def test_to_string(self):
- config = MyServerConfig()
- copy = MyServerConfig.from_string(str(config))
- self.assertEqual(config, copy)
-
- def test_to_string_definitions(self):
- config = MyServerConfig([DefinitionElement('a'), DefinitionTree(
- definitions = [DefinitionElement('b'),
- DefinitionElement('c')])])
- copy = MyServerConfig.from_string(str(config))
- self.assertEqual(config, copy)
-
- def test_to_string(self):
- config = MyServerConfig()
- copy = MyServerConfig.from_lxml_element(config.to_lxml_element())
- self.assertEqual(config, copy)
-
- def test_to_string_definitions(self):
- config = MyServerConfig([DefinitionElement('a'), DefinitionTree(
- definitions = [DefinitionElement('b'),
- DefinitionElement('c')])])
- copy = MyServerConfig.from_lxml_element(config.to_lxml_element())
- self.assertEqual(config, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, MyServerConfig.from_string, text)
- self.assertRaises(AttributeError, MyServerConfig.from_lxml_element,
- etree.XML(text))
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git
a/misc/py_control_client/MyServer/pycontrollib/test/definition_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/definition_test.py
deleted file mode 100644
index 669a2a8..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/definition_test.py
+++ /dev/null
@@ -1,481 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from definition import Definition, DefinitionElement, DefinitionTree,
DefinitionList
-from lxml import etree
-import unittest
-
-class DefinitionTest(unittest.TestCase):
- def test_creation(self):
- definition = Definition()
- definition = Definition('no attributes')
- definition = Definition('with attributes', {'a': 'b', 'c': 'd'})
-
- def test_name(self):
- definition = Definition('name1')
- self.assertEqual('name1', definition.get_name())
- definition.set_name('name2')
- self.assertEqual('name2', definition.get_name())
- definition.set_name(None)
- self.assertEqual(None, definition.get_name())
- definition = Definition(name = 'name1')
- self.assertEqual('name1', definition.get_name())
-
- def test_attributes(self):
- definition = Definition('with attributes', {'a': 'b', 'c': 'd'})
- self.assertEqual('b', definition.get_attribute('a'))
- self.assertEqual('d', definition.get_attribute('c'))
- self.assertEqual({'a': 'b', 'c': 'd'}, definition.get_attributes())
- self.assertRaises(KeyError, definition.get_attribute, 'e')
- definition.set_attribute('e', 'f')
- self.assertEqual('f', definition.get_attribute('e'))
- definition.set_attribute('e', 'g')
- self.assertEqual('g', definition.get_attribute('e'))
- definition.remove_attribute('e')
- self.assertRaises(KeyError, definition.get_attribute, 'e')
- self.assertRaises(KeyError, definition.remove_attribute, 'e')
- definition = Definition(attributes = {'a': 'b'})
- self.assertEqual('b', definition.get_attribute('a'))
- self.assertRaises(KeyError, definition.get_attribute, 'e')
-
- def test_value(self):
- self.assertRaises(KeyError, Definition, 'name', {'value': 'x'})
- definition = Definition('name')
- self.assertRaises(KeyError, definition.set_attribute, 'value', 'x')
-
- def test_from_string(self):
- text = '<DEFINE name="http.error.file.404" value="404.html" />'
- definition = Definition.from_string(text)
- self.assertTrue(isinstance(definition, DefinitionElement))
- text = '<DEFINE name="x"><DEFINE value="y" /><DEFINE value="z"
/></DEFINE>'
- definition = Definition.from_string(text)
- self.assertTrue(isinstance(definition, DefinitionTree))
-
- def test_from_lxml(self):
- text = '<DEFINE name="http.error.file.404" value="404.html" />'
- definition = Definition.from_lxml_element(etree.XML(text))
- self.assertTrue(isinstance(definition, DefinitionElement))
- text = '<DEFINE name="x"><DEFINE value="y" /><DEFINE value="z"
/></DEFINE>'
- definition = Definition.from_lxml_element(etree.XML(text))
- self.assertTrue(isinstance(definition, DefinitionTree))
-
- def test_bad_root_tag(self):
- text = '<ERROR name="http.error.file.404" value="404.html" />'
- self.assertEqual('ERROR', Definition.from_string(text).tag)
- self.assertEqual('ERROR', Definition.from_lxml_element(
- etree.XML(text)).tag)
-
- def test_equality(self):
- self.assertNotEqual(Definition(), 'different type')
-
-class DefinitionElementTest(unittest.TestCase):
- def test_creation(self):
- definition = DefinitionElement()
- self.assertTrue(isinstance(definition, Definition))
- definition = DefinitionElement('name')
- self.assertTrue(isinstance(definition, Definition))
- definition = DefinitionElement('name', {'value': 'value'})
- self.assertTrue(isinstance(definition, Definition))
-
- def test_value(self):
- definition = DefinitionElement('name', {'value': 'x'})
- self.assertEqual('x', definition.get_attribute('value'))
- definition.set_attribute('value', 'y')
- self.assertEqual('y', definition.get_attribute('value'))
- definition.set_attribute('value', None)
- self.assertEqual(None, definition.get_attribute('value'))
- definition.remove_attribute('value')
- self.assertRaises(KeyError, definition.get_attribute, 'value')
- definition = DefinitionElement()
- self.assertRaises(KeyError, definition.get_attribute, 'value')
-
- def test_from_string(self):
- text = '<DEFINE />'
- definition = DefinitionElement.from_string(text)
- right = DefinitionElement()
- self.assertEqual(definition, right)
-
- def test_from_string_name(self):
- text = '<DEFINE name="test" />'
- definition = DefinitionElement.from_string(text)
- right = DefinitionElement(name = "test")
- self.assertEqual(definition, right)
-
- def test_from_string_attributes(self):
- text = '<DEFINE a="b" b="c" value="x" />'
- definition = DefinitionElement.from_string(text)
- right = DefinitionElement(attributes = {'a': 'b', 'b': 'c', 'value':
'x'})
- self.assertEqual(definition, right)
-
- def test_from_string_full(self):
- text = '<DEFINE name="test" value="x" a="b" />'
- definition = DefinitionElement.from_string(text)
- right = DefinitionElement('test', {'value': 'x', 'a': 'b'})
- self.assertEqual(definition, right)
-
- def test_from_lxml(self):
- text = '<DEFINE />'
- definition = DefinitionElement.from_lxml_element(etree.XML(text))
- right = DefinitionElement()
- self.assertEqual(definition, right)
-
- def test_from_xml_name(self):
- text = '<DEFINE name="test" />'
- definition = DefinitionElement.from_lxml_element(etree.XML(text))
- right = DefinitionElement(name = "test")
- self.assertEqual(definition, right)
-
- def test_from_lxml_attributes(self):
- text = '<DEFINE a="b" b="c" value="x" />'
- definition = DefinitionElement.from_lxml_element(etree.XML(text))
- right = DefinitionElement(attributes = {'a': 'b', 'b': 'c', 'value':
'x'})
- self.assertEqual(definition, right)
-
- def test_from_lxml_full(self):
- text = '<DEFINE name="test" value="x" a="b" />'
- definition = DefinitionElement.from_lxml_element(etree.XML(text))
- right = DefinitionElement('test', {'value': 'x', 'a': 'b'})
- self.assertEqual(definition, right)
-
- def test_equality(self):
- self.assertEqual(DefinitionElement('name', {'some': 'attributes'}),
- DefinitionElement('name', {'some': 'attributes'}))
- self.assertNotEqual(DefinitionElement('name1'),
- DefinitionElement('name2'))
- self.assertNotEqual(DefinitionElement('name', {'attribute': '1'}),
- DefinitionElement('name', {'attribute': '2'}))
- self.assertNotEqual(DefinitionElement(), 'different type')
-
- def test_to_string(self):
- definition = DefinitionElement()
- copy = DefinitionElement.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_string_name(self):
- definition = DefinitionElement(name = 'test')
- copy = DefinitionElement.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_string_attributes(self):
- definition = DefinitionElement(attributes = {'a': 'b', 'b': 'c',
'value': 'x'})
- copy = DefinitionElement.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_string_full(self):
- definition = DefinitionElement('test', {'value': 'x', 'a': 'b'})
- copy = DefinitionElement.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_lxml(self):
- definition = DefinitionElement()
- copy =
DefinitionElement.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_to_lxml_name(self):
- definition = DefinitionElement(name = 'test')
- copy =
DefinitionElement.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_to_lxml_attributes(self):
- definition = DefinitionElement(attributes = {'a': 'b', 'b': 'c',
'value': 'x'})
- copy =
DefinitionElement.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_to_lxml_full(self):
- definition = DefinitionElement('test', {'value': 'x', 'a': 'b'})
- copy =
DefinitionElement.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR name="http.error.file.404" value="404.html" />'
- self.assertRaises(AttributeError, DefinitionElement.from_string, text)
- self.assertRaises(AttributeError, DefinitionElement.from_lxml_element,
- etree.XML(text))
-
- def test_search_by_name(self):
- definition = DefinitionElement('a')
- self.assertEqual(None, definition.search_by_name('b'))
- self.assertEqual(definition, definition.search_by_name('a'))
-
-class DefinitionTreeTest(unittest.TestCase):
- def setUp(self):
- self.element_0 = DefinitionElement('test', {'value': 'x'})
- self.element_1 = DefinitionElement(attributes = {'a': 'b', 'b': 'c'})
-
- def test_creation(self):
- definition = DefinitionTree()
- self.assertTrue(isinstance(definition, Definition))
- definition = DefinitionTree('name')
- self.assertTrue(isinstance(definition, Definition))
- definition = DefinitionTree('name', [self.element_0])
- self.assertTrue(isinstance(definition, Definition))
- definition = DefinitionTree('name', [self.element_1], {'key': 'value'})
- self.assertTrue(isinstance(definition, Definition))
-
- def test_value(self):
- self.assertRaises(KeyError, DefinitionTree, 'name', [], {'value': 'x'})
- definition = Definition('name')
- self.assertRaises(KeyError, definition.set_attribute, 'value', 'x')
-
- def test_definitions(self):
- definition = DefinitionTree()
- self.assertEqual(0, len(definition.get_definitions()))
- definition.add_definition(self.element_0)
- self.assertEqual(1, len(definition.get_definitions()))
- self.assertEqual(self.element_0, definition.get_definition(0))
- definition.add_definition(self.element_1)
- self.assertEqual(2, len(definition.get_definitions()))
- self.assertEqual(self.element_0, definition.get_definition(0))
- self.assertEqual(self.element_1, definition.get_definition(1))
- definition.remove_definition(0)
- self.assertEqual(1, len(definition.get_definitions()))
- self.assertEqual(self.element_1, definition.get_definition(0))
- definition.add_definition(self.element_0, 0)
- self.assertEqual(2, len(definition.get_definitions()))
- self.assertEqual(self.element_0, definition.get_definition(0))
- self.assertEqual(self.element_1, definition.get_definition(1))
- self.assertRaises(IndexError, definition.get_definition, 2)
- definition = DefinitionTree(definitions = [self.element_0,
self.element_1])
- self.assertEqual(2, len(definition.get_definitions()))
- self.assertEqual(self.element_0, definition.get_definition(0))
- self.assertEqual(self.element_1, definition.get_definition(1))
-
- def test_from_string(self):
- text = '<DEFINE />'
- definition = DefinitionTree.from_string(text)
- right = DefinitionTree()
- self.assertEqual(definition, right)
-
- def test_from_string_name(self):
- text = '<DEFINE name="test" />'
- definition = DefinitionTree.from_string(text)
- right = DefinitionTree(name = "test")
- self.assertEqual(definition, right)
-
- def test_from_string_definitions(self):
- text = '<DEFINE>{0}{1}</DEFINE>'.format(self.element_0, self.element_1)
- definition = DefinitionTree.from_string(text)
- right = DefinitionTree(definitions = [self.element_0, self.element_1])
- self.assertEqual(definition, right)
-
- def test_from_string_attributes(self):
- text = '<DEFINE a="b" b="c" />'
- definition = DefinitionTree.from_string(text)
- right = DefinitionTree(attributes = {'a': 'b', 'b': 'c'})
- self.assertEqual(definition, right)
-
- def test_from_string_full(self):
- text = '<DEFINE name="test" a="b">{0}{1}</DEFINE>'.format(
- self.element_0, self.element_1)
- definition = DefinitionTree.from_string(text)
- right = DefinitionTree('test', [self.element_0, self.element_1], {'a':
'b'})
- self.assertEqual(definition, right)
-
- def test_from_lxml(self):
- text = '<DEFINE />'
- definition = DefinitionTree.from_lxml_element(etree.XML(text))
- right = DefinitionTree()
- self.assertEqual(definition, right)
-
- def test_from_lxml_name(self):
- text = '<DEFINE name="test" />'
- definition = DefinitionTree.from_lxml_element(etree.XML(text))
- right = DefinitionTree(name = "test")
- self.assertEqual(definition, right)
-
- def test_from_lxml_definitions(self):
- text = '<DEFINE>{0}{1}</DEFINE>'.format(self.element_0, self.element_1)
- definition = DefinitionTree.from_lxml_element(etree.XML(text))
- right = DefinitionTree(definitions = [self.element_0, self.element_1])
- self.assertEqual(definition, right)
-
- def test_from_lxml_attributes(self):
- text = '<DEFINE a="b" b="c" />'
- definition = DefinitionTree.from_lxml_element(etree.XML(text))
- right = DefinitionTree(attributes = {'a': 'b', 'b': 'c'})
- self.assertEqual(definition, right)
-
- def test_from_lxml_full(self):
- text = '<DEFINE name="test" a="b">{0}{1}</DEFINE>'.format(
- self.element_0, self.element_1)
- definition = DefinitionTree.from_lxml_element(etree.XML(text))
- right = DefinitionTree('test', [self.element_0, self.element_1], {'a':
'b'})
- self.assertEqual(definition, right)
-
- def test_equality(self):
- definition_0 = DefinitionTree('test', [self.element_0], {'a': 'b'})
- definition_1 = DefinitionTree('test', [self.element_0], {'a': 'b'})
- self.assertEqual(definition_0, definition_1)
- self.assertNotEqual(definition_0, DefinitionTree('', [self.element_0],
{'a': 'b'}))
- self.assertNotEqual(definition_0, DefinitionTree('name', [], {'a':
'b'}))
- self.assertNotEqual(definition_0, DefinitionTree('name',
[self.element_0], {'b': 'b'}))
- self.assertNotEqual(DefinitionTree(), 'different type')
-
- def test_to_string(self):
- definition = DefinitionTree()
- copy = DefinitionTree.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_string_name(self):
- definition = DefinitionTree(name = "test")
- copy = DefinitionTree.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_top_string_definitions(self):
- definition = DefinitionTree(definitions = [self.element_0,
self.element_1])
- copy = DefinitionTree.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_top_string_attributes(self):
- definition = DefinitionTree(attributes = {'a': 'b', 'b': 'c'})
- copy = DefinitionTree.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_string_full(self):
- definition = DefinitionTree('test', [self.element_0, self.element_1],
{'a': 'b'})
- copy = DefinitionTree.from_string(str(definition))
- self.assertEqual(definition, copy)
-
- def test_to_lxml(self):
- definition = DefinitionTree()
- copy = DefinitionTree.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_to_lxml_name(self):
- definition = DefinitionTree(name = "test")
- copy = DefinitionTree.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_top_lxml_definitions(self):
- definition = DefinitionTree(definitions = [self.element_0,
self.element_1])
- copy = DefinitionTree.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_top_lxml_attributes(self):
- definition = DefinitionTree(attributes = {'a': 'b', 'b': 'c'})
- copy = DefinitionTree.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_to_lxml_full(self):
- definition = DefinitionTree('test', [self.element_0, self.element_1],
{'a': 'b'})
- copy = DefinitionTree.from_lxml_element(definition.to_lxml_element())
- self.assertEqual(definition, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR name="test" key="value">{0}{1}</ERROR>'.format(
- self.element_0, self.element_1)
- self.assertRaises(AttributeError, DefinitionTree.from_string, text)
- self.assertRaises(AttributeError, DefinitionTree.from_lxml_element,
- etree.XML(text))
-
- def test_search_by_name(self):
- element_0 = DefinitionElement('a')
- element_1 = DefinitionElement('b')
- element_2 = DefinitionElement('a')
- tree = DefinitionTree('x', definitions = [element_0, element_1,
element_2])
- self.assertEqual(element_1, tree.search_by_name('b'))
- self.assertEqual(element_2, tree.search_by_name('a'))
- self.assertEqual(None, tree.search_by_name('c'))
- self.assertEqual(tree, tree.search_by_name('x'))
- tree = DefinitionTree('b', definitions = [element_0, element_1,
element_2])
- self.assertEqual(element_1, tree.search_by_name('b'))
-
-class DefinitionListTest(unittest.TestCase):
- def setUp(self):
- self.definitions = []
- self.definitions.append(DefinitionElement('a'))
- self.definitions.append(DefinitionElement('b'))
- self.definitions.append(DefinitionElement('c'))
-
- def test_creation(self):
- def_list = DefinitionList()
- def_list = DefinitionList(self.definitions)
-
- def test_definitions(self):
- def_list = DefinitionList()
- self.assertEqual([], def_list.get_definitions())
- counter = 0
- for definition in self.definitions:
- def_list.add_definition(definition)
- counter += 1
- self.assertEqual(self.definitions[:counter],
- def_list.get_definitions())
- for counter in xrange(len(self.definitions)):
- self.assertEqual(self.definitions[counter],
- def_list.get_definition(counter))
- def_list.add_definition(DefinitionElement('test'), 1)
- self.assertEqual(DefinitionElement('test'), def_list.get_definition(1))
- def_list.remove_definition(1)
- self.assertEqual(self.definitions, def_list.get_definitions())
- for counter in xrange(len(self.definitions)):
- def_list.remove_definition(0)
- self.assertEqual(self.definitions[counter + 1:],
- def_list.get_definitions())
-
- def test_equality(self):
- self.assertEqual(DefinitionList(self.definitions),
- DefinitionList(self.definitions))
- self.assertNotEqual(DefinitionList(), DefinitionList(self.definitions))
- self.assertNotEqual(DefinitionList(), 'other type')
-
- def test_search_by_name(self):
- def_list = DefinitionList()
- self.assertEqual(None, def_list.search_by_name('x'))
- element_0 = DefinitionElement('x')
- def_list.add_definition(element_0)
- self.assertEqual(element_0, def_list.search_by_name('x'))
- element_1 = DefinitionElement('x')
- def_list.add_definition(element_1)
- self.assertEqual(element_1, def_list.search_by_name('x'))
- element_2 = DefinitionElement('x')
- tree_1 = DefinitionTree('t', definitions = [element_2])
- self.assertEqual(element_2, def_list.search_by_name('x'))
- def_list.add_definition(element_1)
- self.assertEqual(element_1, def_list.search_by_name('x'))
-
- def test_to_string(self):
- def_list = DefinitionList(self.definitions)
- text = '<wrap>{0}</wrap>'.format(def_list)
- copy = DefinitionList()
- for lxml_definition in list(etree.XML(text)):
- copy.add_definition(Definition.from_lxml_element(lxml_definition))
- self.assertEqual(def_list, copy)
-
-class BadMarkupTest(unittest.TestCase):
- def test_definition_tree(self):
- text = '''
-<DEFINE>
- <DEFINE value="x" />
- <DEFINE vlaue="y" />
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</DEFINE>'''
- definition = Definition.from_string(text)
- def_tree = definition.to_lxml_element()
- self.assertEqual(2, len(def_tree.findall('DEFINE')))
- unknown = def_tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/misc/py_control_client/MyServer/pycontrollib/test/log_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/log_test.py
deleted file mode 100644
index 823eacb..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/log_test.py
+++ /dev/null
@@ -1,425 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import unittest
-from log import Stream, Log
-from lxml import etree
-
-class StreamTest(unittest.TestCase):
- def test_creation(self):
- log = Stream()
- log = Stream('/logs/MyServer.log')
- log = Stream('/logs/MyServer.log', 1048576)
- log = Stream('/logs/MyServer.log', 1048576, False)
- log = Stream('/logs/MyServer.log', 1048576, False, ['gzip', 'bzip2'])
-
- def test_location(self):
- log = Stream()
- self.assertEqual(None, log.get_location())
- log.set_location('/logs/new.log')
- self.assertEqual('/logs/new.log', log.get_location())
- log.set_location(None)
- self.assertEqual(None, log.get_location())
- log = Stream('/logs/MyServer.log')
- self.assertEqual('/logs/MyServer.log', log.get_location())
- log = Stream(location = '/logs/MyServer.log')
- self.assertEqual('/logs/MyServer.log', log.get_location())
-
- def test_cycle(self):
- log = Stream()
- self.assertEqual(None, log.get_cycle())
- log.set_cycle(123)
- self.assertEqual(123, log.get_cycle())
- log.set_cycle(None)
- self.assertEqual(None, log.get_cycle())
- log = Stream('path', 123)
- self.assertEqual(123, log.get_cycle())
- log = Stream(cycle = 123)
- self.assertEqual(123, log.get_cycle())
-
- def test_cycle_gzip(self):
- log = Stream()
- self.assertEqual(None, log.get_cycle_gzip())
- log.set_cycle_gzip(True)
- self.assertEqual(True, log.get_cycle_gzip())
- log.set_cycle_gzip(None)
- self.assertEqual(None, log.get_cycle_gzip())
- log = Stream('path', 123, False)
- self.assertEqual(False, log.get_cycle_gzip())
- log = Stream(cycle_gzip = False)
- self.assertEqual(False, log.get_cycle_gzip())
-
- def test_filters(self):
- log = Stream()
- self.assertEqual([], log.get_filters())
- log.add_filter('gzip')
- self.assertEqual(['gzip'], log.get_filters())
- log.add_filter('bzip2')
- self.assertEqual(['gzip', 'bzip2'], log.get_filters())
- log.add_filter('bzip2', 0)
- self.assertEqual(['bzip2', 'gzip', 'bzip2'], log.get_filters())
- self.assertEqual('gzip', log.get_filter(1))
- log.remove_filter(1)
- self.assertEqual(['bzip2', 'bzip2'], log.get_filters())
- log = Stream('path', 123, False, ['gzip'])
- self.assertEqual(['gzip'], log.get_filters())
- log = Stream(filters = ['gzip'])
- self.assertEqual(['gzip'], log.get_filters())
-
- def test_from_string(self):
- text = '<STREAM />'
- log = Stream.from_string(text)
- right = Stream()
- self.assertEqual(log, right)
-
- def test_from_string_location(self):
- text = '<STREAM location="path" />'
- log = Stream.from_string(text)
- right = Stream(location = 'path')
- self.assertEqual(log, right)
-
- def test_from_string_cycle(self):
- text = '<STREAM cycle="123" />'
- log = Stream.from_string(text)
- right = Stream(cycle = 123)
- self.assertEqual(log, right)
-
- def test_from_string_cycle_gzip(self):
- text = '<STREAM cycle_gzip="NO" />'
- log = Stream.from_string(text)
- right = Stream(cycle_gzip = False)
- self.assertEqual(log, right)
-
- def test_from_string_filters(self):
- text = '<STREAM><FILTER>gzip</FILTER><FILTER>bzip2</FILTER></STREAM>'
- log = Stream.from_string(text)
- right = Stream(filters = ['gzip', 'bzip2'])
- self.assertEqual(log, right)
-
- def test_from_string_full(self):
- text = '''<STREAM location="path" cycle="123" cycle_gzip="NO">
- <FILTER>gzip</FILTER>
- <FILTER>bzip2</FILTER>
-</STREAM>'''
- log = Stream.from_string(text)
- right = Stream('path', 123, False, ['gzip', 'bzip2'])
- self.assertEqual(log, right)
-
- def test_from_lxml(self):
- text = '<STREAM />'
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream()
- self.assertEqual(log, right)
-
- def test_from_lxml_location(self):
- text = '<STREAM location="path" />'
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream(location = 'path')
- self.assertEqual(log, right)
-
- def test_from_lxml_cycle(self):
- text = '<STREAM cycle="123" />'
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream(cycle = 123)
- self.assertEqual(log, right)
-
- def test_from_lxml_cycle_gzip(self):
- text = '<STREAM cycle_gzip="NO" />'
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream(cycle_gzip = False)
- self.assertEqual(log, right)
-
- def test_from_lxml_filters(self):
- text = '<STREAM><FILTER>gzip</FILTER><FILTER>bzip2</FILTER></STREAM>'
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream(filters = ['gzip', 'bzip2'])
- self.assertEqual(log, right)
-
- def test_from_lxml_full(self):
- text = '''<STREAM location="path" cycle="123" cycle_gzip="NO">
- <FILTER>gzip</FILTER>
- <FILTER>bzip2</FILTER>
-</STREAM>'''
- log = Stream.from_lxml_element(etree.XML(text))
- right = Stream('path', 123, False, ['gzip', 'bzip2'])
- self.assertEqual(log, right)
-
- def test_bad_root_tag(self):
- text = '<ERROR location="path" />'
- self.assertRaises(AttributeError, Stream.from_string, text)
- self.assertRaises(AttributeError, Stream.from_lxml_element,
- etree.XML(text))
-
- def test_equality(self):
- self.assertEqual(Stream('path', 123, False, ['gzip', 'bzip2']),
- Stream('path', 123, False, ['gzip', 'bzip2']))
- self.assertNotEqual(Stream('path1', 123, False, ['gzip', 'bzip2']),
- Stream('path2', 123, False, ['gzip', 'bzip2']))
- self.assertNotEqual(Stream('path', 1234, False, ['gzip', 'bzip2']),
- Stream('path', 123, False, ['gzip', 'bzip2']))
- self.assertNotEqual(Stream('path', 123, True, ['gzip', 'bzip2']),
- Stream('path', 123, False, ['gzip', 'bzip2']))
- self.assertNotEqual(Stream('path', 123, False, ['bzip2']),
- Stream('path', 123, False, ['gzip', 'bzip2']))
- self.assertNotEqual([], Stream('path'))
-
- def test_to_string(self):
- log = Stream()
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_location(self):
- log = Stream(location = 'path')
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_cycle(self):
- log = Stream(cycle = 123)
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_cycle_gzip(self):
- log = Stream(cycle_gzip = False)
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_filters(self):
- log = Stream(filters = ['gzip', 'bzip2'])
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_full(self):
- log = Stream('path', 123, False, ['gzip', 'bzip2'])
- copy = Stream.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_lxml(self):
- log = Stream()
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_location(self):
- log = Stream(location = 'path')
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_cycle(self):
- log = Stream(cycle = 123)
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_cycle_gzip(self):
- log = Stream(cycle_gzip = False)
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_filters(self):
- log = Stream(filters = ['gzip', 'bzip2'])
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_full(self):
- log = Stream('path', 123, False, ['gzip', 'bzip2'])
- copy = Stream.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
-class LogTest(unittest.TestCase):
- def setUp(self):
- self.stream_0 = Stream(location = 'file://logs/MyServerHTTP.log')
- self.stream_1 = Stream(location = 'console://stdout', filters =
['gzip'])
-
- def test_creation(self):
- log = Log('ACCESSLOG')
- log = Log('WARNINGLOG')
- log = Log('ACCESSLOG', [self.stream_0])
- log = Log('ACCESSLOG', [self.stream_0], 'combined')
-
- def test_log_type(self):
- log = Log('ACCESSLOG')
- self.assertEqual('ACCESSLOG', log.get_log_type())
- log.set_log_type('WARNINGLOG')
- self.assertEqual('WARNINGLOG', log.get_log_type())
- self.assertRaises(AttributeError, log.set_log_type, None)
- self.assertRaises(AttributeError, Log, None)
-
- def test_type(self):
- log = Log('ACCESSLOG')
- self.assertEqual(None, log.get_type())
- log.set_type('combined')
- self.assertEqual('combined', log.get_type())
- log.set_type(None)
- self.assertEqual(None, log.get_type())
- log = Log('ACCESSLOG', [], 'combined')
- self.assertEqual('combined', log.get_type())
-
- def test_stream(self):
- log = Log('ACCESSLOG')
- self.assertEqual([], log.get_streams())
- log.add_stream(self.stream_0)
- self.assertEqual([self.stream_0], log.get_streams())
- log.add_stream(self.stream_1)
- self.assertEqual([self.stream_0, self.stream_1], log.get_streams())
- log.add_stream(self.stream_1, 0)
- self.assertEqual([self.stream_1, self.stream_0, self.stream_1],
- log.get_streams())
- self.assertEqual(self.stream_0, log.get_stream(1))
- log.remove_stream(1)
- self.assertEqual([self.stream_1, self.stream_1], log.get_streams())
- log = Log('ACCESSLOG', [self.stream_0])
- self.assertEqual([self.stream_0], log.get_streams())
-
- def test_from_string(self):
- text = '<ACCESSLOG />'
- log = Log.from_string(text)
- right = Log('ACCESSLOG')
- self.assertEqual(log, right)
-
- def test_from_string_type(self):
- text = '<ACCESSLOG type="combined" />'
- log = Log.from_string(text)
- right = Log('ACCESSLOG', type = "combined")
- self.assertEqual(log, right)
-
- def test_from_string_streams(self):
- text = '<ACCESSLOG>{0}{1}</ACCESSLOG>'.format(self.stream_0,
self.stream_1)
- log = Log.from_string(text)
- right = Log('ACCESSLOG', streams = [self.stream_0, self.stream_1])
- self.assertEqual(log, right)
-
- def test_from_string_full(self):
- text = '<ACCESSLOG
type="combined">{0}{1}</ACCESSLOG>'.format(self.stream_0, self.stream_1)
- log = Log.from_string(text)
- right = Log('ACCESSLOG', [self.stream_0, self.stream_1], 'combined')
- self.assertEqual(log, right)
-
- def test_from_lxml(self):
- text = '<ACCESSLOG />'
- log = Log.from_lxml_element(etree.XML(text))
- right = Log('ACCESSLOG')
- self.assertEqual(log, right)
-
- def test_from_lxml_type(self):
- text = '<ACCESSLOG type="combined" />'
- log = Log.from_lxml_element(etree.XML(text))
- right = Log('ACCESSLOG', type = "combined")
- self.assertEqual(log, right)
-
- def test_from_lxml_streams(self):
- text = '<ACCESSLOG>{0}{1}</ACCESSLOG>'.format(self.stream_0,
self.stream_1)
- log = Log.from_lxml_element(etree.XML(text))
- right = Log('ACCESSLOG', streams = [self.stream_0, self.stream_1])
- self.assertEqual(log, right)
-
- def test_from_lxml_full(self):
- text = '<ACCESSLOG
type="combined">{0}{1}</ACCESSLOG>'.format(self.stream_0, self.stream_1)
- log = Log.from_lxml_element(etree.XML(text))
- right = Log('ACCESSLOG', [self.stream_0, self.stream_1], 'combined')
- self.assertEqual(log, right)
-
- def test_equality(self):
- self.assertEqual(Log('ACCESSLOG', [self.stream_0, self.stream_1],
'combined'),
- Log('ACCESSLOG', [self.stream_0, self.stream_1],
'combined'))
- self.assertNotEqual(Log('ACCESSLOG', [self.stream_0], 'combined'),
- Log('WARNINGLOG', [self.stream_0], 'combined'))
- self.assertNotEqual(Log('ACCESSLOG', [self.stream_0], 'combined'),
- Log('ACCESSLOG', [self.stream_1], 'combined'))
- self.assertNotEqual(Log('ACCESSLOG', [self.stream_0], 'combined'),
- Log('WARNINGLOG', [self.stream_0], None))
- self.assertNotEqual([], Log('ACCESSLOG'))
-
- def test_to_string(self):
- log = Log('ACCESSLOG')
- copy = Log.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_type(self):
- log = Log('ACCESSLOG', type = "combined")
- copy = Log.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_streams(self):
- log = Log('ACCESSLOG', streams = [self.stream_0, self.stream_1])
- copy = Log.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_string_full(self):
- log = Log('ACCESSLOG', [self.stream_0, self.stream_1], 'combined')
- copy = Log.from_string(str(log))
- self.assertEqual(log, copy)
-
- def test_to_lxml(self):
- log = Log('ACCESSLOG')
- copy = Log.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_type(self):
- log = Log('ACCESSLOG', type = "combined")
- copy = Log.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_streams(self):
- log = Log('ACCESSLOG', streams = [self.stream_0, self.stream_1])
- copy = Log.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
- def test_to_lxml_full(self):
- log = Log('ACCESSLOG', [self.stream_0, self.stream_1], 'combined')
- copy = Log.from_lxml_element(log.to_lxml_element())
- self.assertEqual(log, copy)
-
-class BadMarkupTest(unittest.TestCase):
- def test_stream(self):
- text = '''
-<STREAM custom="unknown">
- abc
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</STREAM>'''
- stream = Stream.from_string(text)
- tree = stream.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def test_log(self):
- text = '''
-<SOMELOG custom="unknown">
- <STREAM>abc</STREAM>
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</SOMELOG>'''
- log = Log.from_string(text)
- tree = log.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
-if __name__ == '__main__':
- unittest.main()
diff --git
a/misc/py_control_client/MyServer/pycontrollib/test/mimetypes_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/mimetypes_test.py
deleted file mode 100644
index 4183577..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/mimetypes_test.py
+++ /dev/null
@@ -1,484 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import unittest
-from lxml import etree
-from mimetypes import MIMEType, MIMETypes
-from definition import DefinitionElement, DefinitionTree
-
-class MIMETypeTest(unittest.TestCase):
- def setUp(self):
- self.definitions = []
- self.definitions.append(DefinitionElement('http.use_error_file',
- {'value': 'YES'}))
- self.definitions.append(DefinitionElement('http.error.file.404',
- {'value': '404.html'}))
- self.definitions.append(
- DefinitionTree(
- 'http.default_file',
- [DefinitionElement(attributes = {'value': 'index.html'}),
- DefinitionElement(attributes = {'value': 'index.htm'})]))
-
- def test_creation(self):
- MIMEType('text/plain')
- MIMEType('text/plain', 'CGI')
- MIMEType('text/plain', 'CGI', '/usr/bin/python')
- MIMEType('text/plain', 'CGI', '/usr/bin/python', set(['py']))
- MIMEType('text/plain', 'CGI', '/usr/bin/python', set(['py']),
- '^/cgi-bin/.*$')
- MIMEType('text/plain', 'CGI', '/usr/bin/python', set(['py']),
- '^/cgi-bin/.*$', ['gzip'])
- MIMEType('text/plain', 'CGI', '/usr/bin/python', set(['py']),
- '^/cgi-bin/.*$', ['gzip'], 'NO')
- MIMEType('text/plain', 'CGI', '/usr/bin/python', set(['py']),
- '^/cgi-bin/.*$', ['gzip'], 'NO', self.definitions)
-
- def test_mime(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual('text/plain', mime.get_mime())
- mime.set_mime('application/xhtml+xml')
- self.assertEqual('application/xhtml+xml', mime.get_mime())
- self.assertRaises(AttributeError, mime.set_mime, None)
- self.assertRaises(AttributeError, MIMEType, None, 'SEND')
-
- def test_handler(self):
- mime = MIMEType('text/plain',)
- self.assertEqual(None, mime.get_handler())
- mime.set_handler('SEND')
- self.assertEqual('SEND', mime.get_handler())
- mime.set_handler(None)
- self.assertEqual(None, mime.get_handler())
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual('SEND', mime.get_handler())
- mime = MIMEType('text/plain', handler = 'SEND')
- self.assertEqual('SEND', mime.get_handler())
-
- def test_param(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual(None, mime.get_param())
- mime.set_param('/usr/bin/python')
- self.assertEqual('/usr/bin/python', mime.get_param())
- mime.set_param(None)
- self.assertEqual(None, mime.get_param())
- mime = MIMEType('text/plain', 'SEND', param = '/usr/bin/python')
- self.assertEqual('/usr/bin/python', mime.get_param())
-
- def test_extension(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual(set(), mime.get_extensions())
- mime.add_extension('py')
- mime.add_extension('html')
- self.assertEqual(set(['py', 'html']), mime.get_extensions())
- mime.remove_extension('py')
- self.assertEqual(set(['html']), mime.get_extensions())
- mime = MIMEType('text/plain', 'SEND', extensions = set(['py', 'html']))
- self.assertEqual(set(['py', 'html']), mime.get_extensions())
-
- def test_path(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual(None, mime.get_path())
- mime.set_path('^/www/.*$')
- self.assertEqual('^/www/.*$', mime.get_path())
- mime.set_path(None)
- self.assertEqual(None, mime.get_path())
- mime = MIMEType('text/plain', 'SEND', path = '^/www/.*$')
- self.assertEqual('^/www/.*$', mime.get_path())
-
- def test_filters(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual([], mime.get_filters())
- mime.add_filter('gzip')
- mime.add_filter('bzip2')
- self.assertEqual(['gzip', 'bzip2'], mime.get_filters())
- mime.add_filter('bzip2', 0)
- self.assertEqual(['bzip2', 'gzip', 'bzip2'], mime.get_filters())
- mime.remove_filter(2)
- self.assertEqual(['bzip2', 'gzip'], mime.get_filters())
- self.assertEqual('gzip', mime.get_filter(1))
- mime = MIMEType('text/plain', 'SEND', filters = ['gzip', 'bzip2'])
- self.assertEqual(['gzip', 'bzip2'], mime.get_filters())
-
- def test_self_executed(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual(None, mime.get_self_executed())
- mime.set_self_executed('YES')
- self.assertEqual('YES', mime.get_self_executed())
- mime.set_self_executed(None)
- self.assertEqual(None, mime.get_self_executed())
- mime = MIMEType('text/plain', 'SEND', self_executed = 'YES')
- self.assertEqual('YES', mime.get_self_executed())
-
- def test_definitions(self):
- mime = MIMEType('text/plain', 'SEND')
- self.assertEqual([], mime.get_definitions())
- for definition in self.definitions:
- mime.add_definition(definition)
- self.assertEqual(self.definitions, mime.get_definitions())
- for i in xrange(len(self.definitions)):
- self.assertEqual(self.definitions[i], mime.get_definition(i))
- mime.remove_definition(0)
- self.assertEqual(self.definitions[1:], mime.get_definitions())
- mime = MIMEType('text/plain', 'SEND', definitions = self.definitions)
- self.assertEqual(self.definitions, mime.get_definitions())
-
- def test_equality(self):
- self.assertEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('other', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'SEND', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python26',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['pyc']), '^/.*$', ['gzip'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/other/.*$', ['gzip'],
'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['bzip2'], 'NO',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'YES',
- self.definitions))
- self.assertNotEqual(MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- self.definitions),
- MIMEType('text/plain', 'CGI', '/usr/bin/python',
- set(['py']), '^/.*$', ['gzip'], 'NO',
- []))
- self.assertNotEqual(MIMEType('text/plain', 'SEND'), 'other type')
-
- def test_from_string(self):
- text = '<MIME mime="text/plain" handler="SEND" />'
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND')
- self.assertEqual(mime, right)
-
- def test_from_string_param(self):
- text = '<MIME mime="text/plain" handler="SEND" param="/usr/bin/python"
/>'
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', '/usr/bin/python')
- self.assertEqual(mime, right)
-
- def test_from_string_extension(self):
- text = '<MIME mime="text/plain" handler="SEND"><EXTENSION value="py"
/></MIME>'
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', extensions = ['py'])
- self.assertEqual(mime, right)
-
- def test_from_string_path(self):
- text = '<MIME mime="text/plain" handler="SEND"><PATH regex="^/.*$"
/></MIME>'
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', path = '^/.*$')
- self.assertEqual(mime, right)
-
- def test_from_string_filter(self):
- text = '''<MIME mime="text/plain" handler="SEND">
- <FILTER value="gzip" />
- <FILTER value="bzip2" />
-</MIME>'''
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', filters = ['gzip', 'bzip2'])
- self.assertEqual(mime, right)
-
- def test_from_string_self_executed(self):
- text = '<MIME mime="text/plain" handler="SEND" self="YES" />'
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', self_executed = 'YES')
- self.assertEqual(mime, right)
-
- def test_from_string_definitions(self):
- text = '<MIME mime="text/plain" handler="SEND">{0}</MIME>'.format(
- '\n'.join(map(str, self.definitions)))
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', definitions = self.definitions)
- self.assertEqual(mime, right)
-
- def test_from_string_full(self):
- text = '''<MIME mime="text/plain" handler="SEND" self="YES"
param="python">
- <EXTENSION value="py" />
- <FILTER value="gzip" />
- <FILTER value="bzip2" />
- <PATH regex="^/.*$" />
- {0}
-</MIME>'''.format('\n'.join(map(str, self.definitions)))
- mime = MIMEType.from_string(text)
- right = MIMEType('text/plain', 'SEND', 'python', ['py'], '^/.*$',
- ['gzip', 'bzip2'], 'YES', self.definitions)
- self.assertEqual(mime, right)
-
- def test_from_lxml(self):
- text = '<MIME mime="text/plain" handler="SEND" />'
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND')
- self.assertEqual(mime, right)
-
- def test_from_lxml_param(self):
- text = '<MIME mime="text/plain" handler="SEND" param="/usr/bin/python"
/>'
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', '/usr/bin/python')
- self.assertEqual(mime, right)
-
- def test_from_lxml_extension(self):
- text = '<MIME mime="text/plain" handler="SEND"><EXTENSION value="py"
/></MIME>'
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', extensions = ['py'])
- self.assertEqual(mime, right)
-
- def test_from_lxml_path(self):
- text = '<MIME mime="text/plain" handler="SEND"><PATH regex="^/.*$"
/></MIME>'
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', path = '^/.*$')
- self.assertEqual(mime, right)
-
- def test_from_lxml_filter(self):
- text = '''<MIME mime="text/plain" handler="SEND">
- <FILTER value="gzip" />
- <FILTER value="bzip2" />
-</MIME>'''
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', filters = ['gzip', 'bzip2'])
- self.assertEqual(mime, right)
-
- def test_from_lxml_self_executed(self):
- text = '<MIME mime="text/plain" handler="SEND" self="YES" />'
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', self_executed = 'YES')
- self.assertEqual(mime, right)
-
- def test_from_lxml_definitions(self):
- text = '<MIME mime="text/plain" handler="SEND">{0}</MIME>'.format(
- '\n'.join(map(str, self.definitions)))
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', definitions = self.definitions)
- self.assertEqual(mime, right)
-
- def test_from_lxml_full(self):
- text = '''<MIME mime="text/plain" handler="SEND" self="YES"
param="python">
- <EXTENSION value="py" />
- <FILTER value="gzip" />
- <FILTER value="bzip2" />
- <PATH regex="^/.*$" />
- {0}
-</MIME>'''.format('\n'.join(map(str, self.definitions)))
- mime = MIMEType.from_lxml_element(etree.XML(text))
- right = MIMEType('text/plain', 'SEND', 'python', ['py'], '^/.*$',
- ['gzip', 'bzip2'], 'YES', self.definitions)
- self.assertEqual(mime, right)
-
- def test_bad_root_tag(self):
- text = '<ERROR mime="application/xhtml+xml" handler="CGI" />'
- self.assertRaises(AttributeError, MIMEType.from_string, text)
- self.assertRaises(AttributeError, MIMEType.from_lxml_element,
- etree.XML(text))
-
- def test_to_string(self):
- mime = MIMEType('text/plain', 'SEND')
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_param(self):
- mime = MIMEType('text/plain', 'SEND', '/usr/bin/python')
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_extension(self):
- mime = MIMEType('text/plain', 'SEND', extensions = ['py'])
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_path(self):
- mime = MIMEType('text/plain', 'SEND', path = '^/.*$')
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_filter(self):
- mime = MIMEType('text/plain', 'SEND', filters = ['gzip', 'bzip2'])
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_self_executed(self):
- mime = MIMEType('text/plain', 'SEND', self_executed = 'YES')
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_definitions(self):
- mime = MIMEType('text/plain', 'SEND', definitions = self.definitions)
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_string_full(self):
- mime = MIMEType('text/plain', 'SEND', 'python', ['py'], '^/.*$',
- ['gzip', 'bzip2'], 'YES', self.definitions)
- copy = MIMEType.from_string(str(mime))
- self.assertEqual(mime, copy)
-
- def test_to_lxml(self):
- mime = MIMEType('text/plain', 'SEND')
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_param(self):
- mime = MIMEType('text/plain', 'SEND', '/usr/bin/python')
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_extension(self):
- mime = MIMEType('text/plain', 'SEND', extensions = ['py'])
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_path(self):
- mime = MIMEType('text/plain', 'SEND', path = '^/.*$')
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_filter(self):
- mime = MIMEType('text/plain', 'SEND', filters = ['gzip', 'bzip2'])
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_self_executed(self):
- mime = MIMEType('text/plain', 'SEND', self_executed = 'YES')
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_definitions(self):
- mime = MIMEType('text/plain', 'SEND', definitions = self.definitions)
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
- def test_to_lxml_full(self):
- mime = MIMEType('text/plain', 'SEND', 'python', ['py'], '^/.*$',
- ['gzip', 'bzip2'], 'YES', self.definitions)
- copy = MIMEType.from_lxml_element(mime.to_lxml_element())
- self.assertEqual(mime, copy)
-
-class MIMETypesTest(unittest.TestCase):
- def setUp(self):
- self.mime_0 = MIMEType('text/html', 'FASTCGI', '', self_executed =
'YES',
- extensions = ['fcgi'])
- self.mime_1 = MIMEType('text/plain', 'SEND', '',
- extensions = ['asc', 'c', 'cc', 'f', 'f90',
'h', 'hh'])
- self.text = '<MIMES>{0}{1}</MIMES>'.format(self.mime_0, self.mime_1)
-
- def test_creation(self):
- mimes = MIMETypes([self.mime_0, self.mime_1])
- self.assertEqual(mimes.MIME_types[0], self.mime_0)
- self.assertEqual(mimes.MIME_types[1], self.mime_1)
-
- def test_from_string(self):
- mimes = MIMETypes.from_string(self.text)
- self.assertEqual(mimes.MIME_types[0], self.mime_0)
- self.assertEqual(mimes.MIME_types[1], self.mime_1)
-
- def test_from_lxml(self):
- mimes = MIMETypes.from_lxml_element(etree.XML(self.text))
- self.assertEqual(mimes.MIME_types[0], self.mime_0)
- self.assertEqual(mimes.MIME_types[1], self.mime_1)
-
- def test_to_string(self):
- mimes = MIMETypes.from_string(self.text)
- copy = MIMETypes.from_string(str(mimes))
- self.assertEqual(mimes, copy)
-
- def test_to_lxml(self):
- mimes = MIMETypes.from_string(self.text)
- copy = MIMETypes.from_lxml_element(mimes.to_lxml_element())
- self.assertEqual(mimes, copy)
-
- def test_equality(self):
- self.assertEqual(MIMETypes.from_string(self.text),
- MIMETypes.from_string(self.text))
- self.assertNotEqual(MIMETypes.from_string(self.text),
- MIMETypes.from_string(
- '<MIMES>{0}</MIMES>'.format(self.mime_0)))
- self.assertNotEqual(MIMETypes.from_string(self.text), [])
-
- def test_bad_root_tag(self):
- text = '<ERROR>{0}{1}</ERROR>'.format(
- self.mime_0, self.mime_1)
- self.assertRaises(AttributeError, MIMETypes.from_string, text)
- self.assertRaises(AttributeError, MIMETypes.from_lxml_element,
- etree.XML(text))
-
-class BadMarkupTest(unittest.TestCase):
- def test_mime_types(self):
- text = '''
-<MIMES custom="unknown">
- <MIME mime="text/plain" />
- <MIME mime="text/html" />
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</MIMES>'''
- mimes = MIMETypes.from_string(text)
- tree = mimes.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- self.assertEqual(2, len(tree.findall('MIME')))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def test_mime_type(self):
- text = '''
-<MIME mime="text/plain" custom="unknown">
- <CUSTOM />
-</MIME>'''
- mime = MIMEType.from_string(text)
- tree = mime.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- custom = tree.findall('CUSTOM')
- self.assertEqual(1, len(custom))
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/misc/py_control_client/MyServer/pycontrollib/test/security_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/security_test.py
deleted file mode 100644
index a9e4ba3..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/security_test.py
+++ /dev/null
@@ -1,1122 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from security import SecurityElement, User, Condition, Permission, Return,
SecurityList
-from definition import Definition
-from lxml import etree
-import unittest
-
-class SecurityElementTest(unittest.TestCase):
- def test_creation(self):
- element = SecurityElement()
-
- def test_from_string(self):
- text = '<USER />'
- element = SecurityElement.from_string(text)
- self.assertTrue(isinstance(element, User))
- text = '<CONDITION />'
- element = SecurityElement.from_string(text)
- self.assertTrue(isinstance(element, Condition))
- text = '<PERMISSION />'
- element = SecurityElement.from_string(text)
- self.assertTrue(isinstance(element, Permission))
- text = '<RETURN />'
- element = SecurityElement.from_string(text)
- self.assertTrue(isinstance(element, Return))
- text = '<DEFINE />'
- element = SecurityElement.from_string(text)
- self.assertTrue(isinstance(element, Definition))
-
-class ConditionTest(unittest.TestCase):
- def test_creation(self):
- condition = Condition()
- condition = Condition('name')
- condition = Condition('name', 'value')
- condition = Condition('name', 'value', False)
- condition = Condition('name', 'value', False, False)
- condition = Condition('name', 'value', False, False, [])
-
- def test_name(self):
- condition = Condition('name1')
- self.assertEqual('name1', condition.get_name())
- condition.set_name('name2')
- self.assertEqual('name2', condition.get_name())
- condition.set_name(None)
- self.assertEqual(None, condition.get_name())
- condition = Condition(name = 'name1')
- self.assertEqual('name1', condition.get_name())
-
- def test_value(self):
- condition = Condition('name1', 'value1')
- self.assertEqual('value1', condition.get_value())
- condition.set_value('value2')
- self.assertEqual('value2', condition.get_value())
- condition.set_value(None)
- self.assertEqual(None, condition.get_value())
- condition = Condition(value = 'value1')
- self.assertEqual('value1', condition.get_value())
-
- def test_reverse(self):
- condition = Condition('name1', 'value1', False)
- self.assertFalse(condition.get_reverse())
- condition.set_reverse(True)
- self.assertTrue(condition.get_reverse())
- condition.set_reverse(None)
- self.assertEqual(None, condition.get_reverse())
- condition = Condition(reverse = True)
- self.assertTrue(condition.get_reverse())
-
- def test_regex(self):
- condition = Condition('name1', 'value1', False, False)
- self.assertFalse(condition.get_regex())
- condition.set_regex(True)
- self.assertTrue(condition.get_regex())
- condition.set_regex(None)
- self.assertEqual(None, condition.get_regex())
- condition = Condition(regex = True)
- self.assertTrue(condition.get_regex())
-
- def test_sub_elements(self):
- element_0 = Condition()
- element_1 = Return()
- condition = Condition()
- self.assertEqual(0, len(condition.get_sub_elements()))
- condition.add_sub_element(element_0)
- self.assertEqual(1, len(condition.get_sub_elements()))
- self.assertEqual(element_0, condition.get_sub_element(0))
- condition.add_sub_element(element_1)
- self.assertEqual(2, len(condition.get_sub_elements()))
- self.assertEqual(element_0, condition.get_sub_element(0))
- self.assertEqual(element_1, condition.get_sub_element(1))
- condition.remove_sub_element(0)
- self.assertEqual(1, len(condition.get_sub_elements()))
- self.assertEqual(element_1, condition.get_sub_element(0))
- condition.add_sub_element(element_0, 0)
- self.assertEqual(2, len(condition.get_sub_elements()))
- self.assertEqual(element_0, condition.get_sub_element(0))
- self.assertEqual(element_1, condition.get_sub_element(1))
- self.assertRaises(IndexError, condition.get_sub_element, 2)
- condition = Condition(sub_elements = [element_0, element_1])
- self.assertEqual(2, len(condition.get_sub_elements()))
- self.assertEqual(element_0, condition.get_sub_element(0))
- self.assertEqual(element_1, condition.get_sub_element(1))
-
- def test_equality(self):
- self.assertEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name1', 'value1', False, False, []))
- self.assertNotEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name2', 'value1', False, False, []))
- self.assertNotEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name1', 'value2', False, False, []))
- self.assertNotEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name1', 'value1', True, False, []))
- self.assertNotEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name1', 'value1', False, True, []))
- self.assertNotEqual(
- Condition('name1', 'value1', False, False, []),
- Condition('name1', 'value1', False, False, [Condition()]))
- self.assertNotEqual(Condition(), 'another type')
-
- def test_from_string(self):
- text = '<CONDITION />'
- condition = Condition.from_string(text)
- right = Condition()
- self.assertEqual(condition, right)
-
- def test_from_string_name(self):
- text = '<CONDITION name="test" />'
- condition = Condition.from_string(text)
- right = Condition(name = 'test')
- self.assertEqual(condition, right)
-
- def test_from_string_value(self):
- text = '<CONDITION value="test" />'
- condition = Condition.from_string(text)
- right = Condition(value = 'test')
- self.assertEqual(condition, right)
-
- def test_from_string_reverse(self):
- text = '<CONDITION not="yes" />'
- condition = Condition.from_string(text)
- right = Condition(reverse = True)
- self.assertEqual(condition, right)
-
- def test_from_string_regex(self):
- text = '<CONDITION regex="yes" />'
- condition = Condition.from_string(text)
- right = Condition(regex = True)
- self.assertEqual(condition, right)
-
- def test_from_string_sub_elements(self):
- text = '<CONDITION><PERMISSION /><RETURN /></CONDITION>'
- condition = Condition.from_string(text)
- right = Condition(sub_elements = [Permission(), Return()])
- self.assertEqual(condition, right)
-
- def test_from_string_full(self):
- text = '''
-<CONDITION name="name" value="value" not="yes" regex="yes">
- <PERMISSION />
- <RETURN />
-</CONDITION>'''
- condition = Condition.from_string(text)
- right = Condition('name', 'value', True, True,
- [Permission(), Return()])
- self.assertEqual(condition, right)
-
- def test_from_lxml(self):
- text = '<CONDITION />'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition()
- self.assertEqual(condition, right)
-
- def test_from_lxml_name(self):
- text = '<CONDITION name="test" />'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition(name = 'test')
- self.assertEqual(condition, right)
-
- def test_from_lxml_value(self):
- text = '<CONDITION value="test" />'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition(value = 'test')
- self.assertEqual(condition, right)
-
- def test_from_lxml_reverse(self):
- text = '<CONDITION not="yes" />'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition(reverse = True)
- self.assertEqual(condition, right)
-
- def test_from_lxml_regex(self):
- text = '<CONDITION regex="yes" />'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition(regex = True)
- self.assertEqual(condition, right)
-
- def test_from_lxml_sub_elements(self):
- text = '<CONDITION><PERMISSION /><RETURN /></CONDITION>'
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition(sub_elements = [Permission(), Return()])
- self.assertEqual(condition, right)
-
- def test_from_lxml_full(self):
- text = '''
-<CONDITION name="name" value="value" not="yes" regex="yes">
- <PERMISSION />
- <RETURN />
-</CONDITION>'''
- condition = Condition.from_lxml_element(etree.XML(text))
- right = Condition('name', 'value', True, True,
- [Permission(), Return()])
- self.assertEqual(condition, right)
-
- def test_to_string(self):
- condition = Condition()
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_name(self):
- condition = Condition(name = 'name')
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_value(self):
- condition = Condition(value = 'value')
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_reverse(self):
- condition = Condition(reverse = True)
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_regex(self):
- condition = Condition(regex = True)
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_sub_elements(self):
- condition = Condition(sub_elements = [Permission(), Return()])
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_string_full(self):
- condition = Condition('name', 'value', True, True,
- [Permission(), Return()])
- copy = Condition.from_string(str(condition))
- self.assertEqual(condition, copy)
-
- def test_to_lxml(self):
- condition = Condition()
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_name(self):
- condition = Condition(name = 'name')
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_value(self):
- condition = Condition(value = 'value')
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_reverse(self):
- condition = Condition(reverse = True)
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_regex(self):
- condition = Condition(regex = True)
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_sub_elements(self):
- condition = Condition(sub_elements = [Permission(), Return()])
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_to_lxml_full(self):
- condition = Condition('name', 'value', True, True,
- [Permission(), Return()])
- copy = Condition.from_lxml_element(condition.to_lxml_element())
- self.assertEqual(condition, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, Condition.from_string, text)
- self.assertRaises(AttributeError, Condition.from_lxml_element,
- etree.XML(text))
-
-class PermissionTest(unittest.TestCase):
- def test_creation(self):
- permission = Permission()
- permission = Permission(True)
- permission = Permission(True, True)
- permission = Permission(True, True, True)
- permission = Permission(True, True, True, True)
- permission = Permission(True, True, True, True, True)
-
- def test_read(self):
- permission = Permission(True)
- self.assertTrue(permission.get_read())
- permission.set_read(False)
- self.assertFalse(permission.get_read())
- permission.set_read(None)
- self.assertEqual(None, permission.get_read())
- permission = Permission(read = True)
- self.assertTrue(permission.get_read())
-
- def test_execute(self):
- permission = Permission(True, True)
- self.assertTrue(permission.get_execute())
- permission.set_execute(False)
- self.assertFalse(permission.get_execute())
- permission.set_execute(None)
- self.assertEqual(None, permission.get_execute())
- permission = Permission(execute = True)
- self.assertTrue(permission.get_execute())
-
- def test_browse(self):
- permission = Permission(True, True, False)
- self.assertFalse(permission.get_browse())
- permission.set_browse(True)
- self.assertTrue(permission.get_browse())
- permission.set_browse(None)
- self.assertEqual(None, permission.get_browse())
- permission = Permission(browse = True)
- self.assertTrue(permission.get_browse())
-
- def test_delete(self):
- permission = Permission(True, True, False, False)
- self.assertFalse(permission.get_delete())
- permission.set_delete(True)
- self.assertTrue(permission.get_delete())
- permission.set_delete(None)
- self.assertEqual(None, permission.get_delete())
- permission = Permission(delete = True)
- self.assertTrue(permission.get_delete())
-
- def test_write(self):
- permission = Permission(True, True, False, False, False)
- self.assertFalse(permission.get_write())
- permission.set_write(True)
- self.assertTrue(permission.get_write())
- permission.set_write(None)
- self.assertEqual(None, permission.get_write())
- permission = Permission(write = True)
- self.assertTrue(permission.get_write())
-
- def test_equality(self):
- self.assertEqual(
- Permission(False, False, False, False, False),
- Permission(False, False, False, False, False))
- self.assertNotEqual(
- Permission(False, False, False, False, False),
- Permission(True, False, False, False, False))
- self.assertNotEqual(
- Permission(False, False, False, False, False),
- Permission(False, True, False, False, False))
- self.assertNotEqual(
- Permission(False, False, False, False, False),
- Permission(False, False, True, False, False))
- self.assertNotEqual(
- Permission(False, False, False, False, False),
- Permission(False, False, False, True, False))
- self.assertNotEqual(
- Permission(False, False, False, False, False),
- Permission(False, False, False, False, True))
- self.assertNotEqual(Permission(), 'another type')
-
- def test_from_string(self):
- text = '<PERMISSION />'
- permission = Permission.from_string(text)
- right = Permission()
- self.assertEqual(permission, right)
-
- def test_from_string_read(self):
- text = '<PERMISSION READ="NO" />'
- permission = Permission.from_string(text)
- right = Permission(read = False)
- self.assertEqual(permission, right)
-
- def test_from_string_execute(self):
- text = '<PERMISSION EXECUTE="NO" />'
- permission = Permission.from_string(text)
- right = Permission(execute = False)
- self.assertEqual(permission, right)
-
- def test_from_string_browse(self):
- text = '<PERMISSION BROWSE="NO" />'
- permission = Permission.from_string(text)
- right = Permission(browse = False)
- self.assertEqual(permission, right)
-
- def test_from_string_delete(self):
- text = '<PERMISSION DELETE="NO" />'
- permission = Permission.from_string(text)
- right = Permission(delete = False)
- self.assertEqual(permission, right)
-
- def test_from_string_write(self):
- text = '<PERMISSION WRITE="NO" />'
- permission = Permission.from_string(text)
- right = Permission(write = False)
- self.assertEqual(permission, right)
-
- def test_from_string_full(self):
- text = '''
-<PERMISSION READ="NO" EXECUTE="YES" BROWSE="NO" DELETE="YES" WRITE="NO" />'''
- permission = Permission.from_string(text)
- right = Permission(False, True, False, True, False)
- self.assertEqual(permission, right)
-
- def test_from_lxml(self):
- text = '<PERMISSION />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission()
- self.assertEqual(permission, right)
-
- def test_from_lxml_read(self):
- text = '<PERMISSION READ="NO" />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(read = False)
- self.assertEqual(permission, right)
-
- def test_from_lxml_execute(self):
- text = '<PERMISSION EXECUTE="NO" />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(execute = False)
- self.assertEqual(permission, right)
-
- def test_from_lxml_browse(self):
- text = '<PERMISSION BROWSE="NO" />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(browse = False)
- self.assertEqual(permission, right)
-
- def test_from_lxml_delete(self):
- text = '<PERMISSION DELETE="NO" />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(delete = False)
- self.assertEqual(permission, right)
-
- def test_from_lxml_write(self):
- text = '<PERMISSION WRITE="NO" />'
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(write = False)
- self.assertEqual(permission, right)
-
- def test_from_lxml_full(self):
- text = '''
-<PERMISSION READ="NO" EXECUTE="YES" BROWSE="NO" DELETE="YES" WRITE="NO" />'''
- permission = Permission.from_lxml_element(etree.XML(text))
- right = Permission(False, True, False, True, False)
- self.assertEqual(permission, right)
-
- def test_to_string(self):
- permission = Permission()
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_read(self):
- permission = Permission(read = True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_execute(self):
- permission = Permission(execute = True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_browse(self):
- permission = Permission(browse = True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_delete(self):
- permission = Permission(delete = True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_write(self):
- permission = Permission(write = True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_string_full(self):
- permission = Permission(True, False, True, False, True)
- copy = Permission.from_string(str(permission))
- self.assertEqual(permission, copy)
-
- def test_to_lxml(self):
- permission = Permission()
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_read(self):
- permission = Permission(read = True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_execute(self):
- permission = Permission(execute = True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_browse(self):
- permission = Permission(browse = True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_delete(self):
- permission = Permission(delete = True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_write(self):
- permission = Permission(write = True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_to_lxml_full(self):
- permission = Permission(True, False, True, False, True)
- copy = Permission.from_lxml_element(permission.to_lxml_element())
- self.assertEqual(permission, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, Permission.from_string, text)
- self.assertRaises(AttributeError, Permission.from_lxml_element,
- etree.XML(text))
-
-class UserTest(unittest.TestCase):
- def test_creation(self):
- user = User()
- user = User('name')
- user = User('name', 'password')
- user = User('name', 'password', True)
- user = User('name', 'password', True, True)
- user = User('name', 'password', True, True, True)
- user = User('name', 'password', True, True, True, True)
- user = User('name', 'password', True, True, True, True, True)
-
- def test_name(self):
- user = User('name')
- self.assertEqual('name', user.get_name())
- user.set_name('other')
- self.assertEqual('other', user.get_name())
- user.set_name(None)
- self.assertEqual(None, user.get_name())
- user = User(name = 'name')
- self.assertEqual('name', user.get_name())
-
- def test_password(self):
- user = User('name', 'password')
- self.assertEqual('password', user.get_password())
- user.set_password('other')
- self.assertEqual('other', user.get_password())
- user.set_password(None)
- self.assertEqual(None, user.get_password())
- user = User(password = 'password')
- self.assertEqual('password', user.get_password())
-
- def test_read(self):
- user = User('name', 'password', True)
- self.assertTrue(user.get_read())
- user.set_read(False)
- self.assertFalse(user.get_read())
- user.set_read(None)
- self.assertEqual(None, user.get_read())
- user = User(read = True)
- self.assertTrue(user.get_read())
-
- def test_execute(self):
- user = User('name', 'password', True, True)
- self.assertTrue(user.get_execute())
- user.set_execute(False)
- self.assertFalse(user.get_execute())
- user.set_execute(None)
- self.assertEqual(None, user.get_execute())
- user = User(execute = True)
- self.assertTrue(user.get_execute())
-
- def test_browse(self):
- user = User('name', 'password', True, True, False)
- self.assertFalse(user.get_browse())
- user.set_browse(True)
- self.assertTrue(user.get_browse())
- user.set_browse(None)
- self.assertEqual(None, user.get_browse())
- user = User(browse = True)
- self.assertTrue(user.get_browse())
-
- def test_delete(self):
- user = User('name', 'password', True, True, False, False)
- self.assertFalse(user.get_delete())
- user.set_delete(True)
- self.assertTrue(user.get_delete())
- user.set_delete(None)
- self.assertEqual(None, user.get_delete())
- user = User(delete = True)
- self.assertTrue(user.get_delete())
-
- def test_write(self):
- user = User('name', 'password', True, True, False, False, False)
- self.assertFalse(user.get_write())
- user.set_write(True)
- self.assertTrue(user.get_write())
- user.set_write(None)
- self.assertEqual(None, user.get_write())
- user = User(write = True)
- self.assertTrue(user.get_write())
-
- def test_equality(self):
- self.assertEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', False, False, False, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('other', 'password', False, False, False, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'other', False, False, False, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', True, False, False, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', False, True, False, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', False, False, True, False, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', False, False, False, True, False))
- self.assertNotEqual(
- User('name', 'password', False, False, False, False, False),
- User('name', 'password', False, False, False, False, True))
- self.assertNotEqual(User(), 'another type')
-
- def test_from_string(self):
- text = '<USER />'
- user = User.from_string(text)
- right = User()
- self.assertEqual(user, right)
-
- def test_from_string_name(self):
- text = '<USER name="name" />'
- user = User.from_string(text)
- right = User(name = 'name')
- self.assertEqual(user, right)
-
- def test_from_string_password(self):
- text = '<USER password="pass" />'
- user = User.from_string(text)
- right = User(password = 'pass')
- self.assertEqual(user, right)
-
- def test_from_string_read(self):
- text = '<USER READ="NO" />'
- user = User.from_string(text)
- right = User(read = False)
- self.assertEqual(user, right)
-
- def test_from_string_execute(self):
- text = '<USER EXECUTE="NO" />'
- user = User.from_string(text)
- right = User(execute = False)
- self.assertEqual(user, right)
-
- def test_from_string_browse(self):
- text = '<USER BROWSE="NO" />'
- user = User.from_string(text)
- right = User(browse = False)
- self.assertEqual(user, right)
-
- def test_from_string_delete(self):
- text = '<USER DELETE="NO" />'
- user = User.from_string(text)
- right = User(delete = False)
- self.assertEqual(user, right)
-
- def test_from_string_write(self):
- text = '<USER WRITE="NO" />'
- user = User.from_string(text)
- right = User(write = False)
- self.assertEqual(user, right)
-
- def test_from_string_full(self):
- text = '''
-<USER name="name" password="pass" READ="NO" EXECUTE="YES" BROWSE="NO"
- DELETE="YES" WRITE="NO" />'''
- user = User.from_string(text)
- right = User('name', 'pass', False, True, False, True, False)
- self.assertEqual(user, right)
-
- def test_from_lxml(self):
- text = '<USER />'
- user = User.from_lxml_element(etree.XML(text))
- right = User()
- self.assertEqual(user, right)
-
- def test_from_lxml_name(self):
- text = '<USER name="name" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(name = 'name')
- self.assertEqual(user, right)
-
- def test_from_lxml_password(self):
- text = '<USER password="pass" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(password = 'pass')
- self.assertEqual(user, right)
-
- def test_from_lxml_read(self):
- text = '<USER READ="NO" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(read = False)
- self.assertEqual(user, right)
-
- def test_from_lxml_execute(self):
- text = '<USER EXECUTE="NO" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(execute = False)
- self.assertEqual(user, right)
-
- def test_from_lxml_browse(self):
- text = '<USER BROWSE="NO" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(browse = False)
- self.assertEqual(user, right)
-
- def test_from_lxml_delete(self):
- text = '<USER DELETE="NO" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(delete = False)
- self.assertEqual(user, right)
-
- def test_from_lxml_write(self):
- text = '<USER WRITE="NO" />'
- user = User.from_lxml_element(etree.XML(text))
- right = User(write = False)
- self.assertEqual(user, right)
-
- def test_from_lxml_full(self):
- text = '''
-<USER name="name" password="pass" READ="NO" EXECUTE="YES" BROWSE="NO"
- DELETE="YES" WRITE="NO" />'''
- user = User.from_lxml_element(etree.XML(text))
- right = User('name', 'pass', False, True, False, True, False)
- self.assertEqual(user, right)
-
- def test_to_string(self):
- user = User()
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_name(self):
- user = User(name = 'name')
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_password(self):
- user = User(password = 'pass')
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_read(self):
- user = User(read = True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_execute(self):
- user = User(execute = True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_browse(self):
- user = User(browse = True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_delete(self):
- user = User(delete = True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_write(self):
- user = User(write = True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_string_full(self):
- user = User('name', 'pass', True, False, True, False, True)
- copy = User.from_string(str(user))
- self.assertEqual(user, copy)
-
- def test_to_lxml(self):
- user = User()
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_name(self):
- user = User(name = 'name')
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_password(self):
- user = User(password = 'pass')
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_read(self):
- user = User(read = True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_execute(self):
- user = User(execute = True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_browse(self):
- user = User(browse = True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_delete(self):
- user = User(delete = True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_write(self):
- user = User(write = True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_to_lxml_full(self):
- user = User('name', 'pass', True, False, True, False, True)
- copy = User.from_lxml_element(user.to_lxml_element())
- self.assertEqual(user, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, User.from_string, text)
- self.assertRaises(AttributeError, User.from_lxml_element,
- etree.XML(text))
-
-class ReturnTest(unittest.TestCase):
- def test_creation(self):
- ret = Return()
- ret = Return('ALLOW')
-
- def test_value(self):
- ret = Return('ALLOW')
- self.assertEqual('ALLOW', ret.get_value())
- ret.set_value('DENY')
- self.assertEqual('DENY', ret.get_value())
- ret.set_value(None)
- self.assertEqual(None, ret.get_value())
- ret = Return(value = 'ALLOW')
- self.assertEqual('ALLOW', ret.get_value())
-
- def test_equality(self):
- self.assertEqual(Return('ALLOW'), Return('ALLOW'))
- self.assertNotEqual(Return('ALLOW'), Return('DENY'))
- self.assertNotEqual(Return(), 'another type')
-
- def test_from_string(self):
- text = '<RETURN />'
- ret = Return.from_string(text)
- right = Return()
- self.assertEqual(ret, right)
-
- def test_from_string_value(self):
- text = '<RETURN value="ALLOW" />'
- ret = Return.from_string(text)
- right = Return(value = 'ALLOW')
- self.assertEqual(ret, right)
-
- def test_from_lxml(self):
- text = '<RETURN />'
- ret = Return.from_lxml_element(etree.XML(text))
- right = Return()
- self.assertEqual(ret, right)
-
- def test_from_lxml_value(self):
- text = '<RETURN value="ALLOW" />'
- ret = Return.from_lxml_element(etree.XML(text))
- right = Return(value = 'ALLOW')
- self.assertEqual(ret, right)
-
- def test_to_string(self):
- ret = Return()
- copy = Return.from_string(str(ret))
- self.assertEqual(ret, copy)
-
- def test_to_string_value(self):
- ret = Return(value = 'ALLOW')
- copy = Return.from_string(str(ret))
- self.assertEqual(ret, copy)
-
- def test_to_lxml(self):
- ret = Return()
- copy = Return.from_lxml_element(ret.to_lxml_element())
- self.assertEqual(ret, copy)
-
- def test_to_lxml_value(self):
- ret = Return(value = 'ALLOW')
- copy = Return.from_lxml_element(ret.to_lxml_element())
- self.assertEqual(ret, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, Return.from_string, text)
- self.assertRaises(AttributeError, Return.from_lxml_element,
- etree.XML(text))
-
-class SecurityListTest(unittest.TestCase):
- def test_creation(self):
- slist = SecurityList()
- slist = SecurityList([Permission(), Return()])
-
- def test_elements(self):
- element_0 = Condition()
- element_1 = Return()
- slist = SecurityList()
- self.assertEqual(0, len(slist.get_elements()))
- slist.add_element(element_0)
- self.assertEqual(1, len(slist.get_elements()))
- self.assertEqual(element_0, slist.get_element(0))
- slist.add_element(element_1)
- self.assertEqual(2, len(slist.get_elements()))
- self.assertEqual(element_0, slist.get_element(0))
- self.assertEqual(element_1, slist.get_element(1))
- slist.remove_element(0)
- self.assertEqual(1, len(slist.get_elements()))
- self.assertEqual(element_1, slist.get_element(0))
- slist.add_element(element_0, 0)
- self.assertEqual(2, len(slist.get_elements()))
- self.assertEqual(element_0, slist.get_element(0))
- self.assertEqual(element_1, slist.get_element(1))
- self.assertRaises(IndexError, slist.get_element, 2)
- slist = SecurityList(elements = [element_0, element_1])
- self.assertEqual(2, len(slist.get_elements()))
- self.assertEqual(element_0, slist.get_element(0))
- self.assertEqual(element_1, slist.get_element(1))
-
- def test_equality(self):
- self.assertEqual(SecurityList([Condition()]),
- SecurityList([Condition()]))
- self.assertNotEqual(SecurityList([Condition()]),
- SecurityList([]))
- self.assertNotEqual(SecurityList(), 'another type')
-
- def test_from_string(self):
- text = '<SECURITY />'
- slist = SecurityList.from_string(text)
- right = SecurityList()
- self.assertEqual(slist, right)
-
- def test_from_string_elements(self):
- text = '<SECURITY><CONDITION /><RETURN /></SECURITY>'
- slist = SecurityList.from_string(text)
- right = SecurityList([Condition(), Return()])
- self.assertEqual(slist, right)
-
- def test_from_lxml(self):
- text = '<SECURITY />'
- slist = SecurityList.from_lxml_element(etree.XML(text))
- right = SecurityList()
- self.assertEqual(slist, right)
-
- def test_from_lxml_elements(self):
- text = '<SECURITY><CONDITION /><RETURN /></SECURITY>'
- slist = SecurityList.from_lxml_element(etree.XML(text))
- right = SecurityList([Condition(), Return()])
- self.assertEqual(slist, right)
-
- def test_to_string(self):
- slist = SecurityList()
- copy = SecurityList.from_string(str(slist))
- self.assertEqual(slist, copy)
-
- def test_to_string_elements(self):
- slist = SecurityList([Condition(), Return()])
- copy = SecurityList.from_string(str(slist))
- self.assertEqual(slist, copy)
-
- def test_to_lxml(self):
- slist = SecurityList()
- copy = SecurityList.from_lxml_element(slist.to_lxml_element())
- self.assertEqual(slist, copy)
-
- def test_to_string_elements(self):
- slist = SecurityList([Condition(), Return()])
- copy = SecurityList.from_lxml_element(slist.to_lxml_element())
- self.assertEqual(slist, copy)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, SecurityList.from_string, text)
- self.assertRaises(AttributeError, SecurityList.from_lxml_element,
- etree.XML(text))
-
-class BadMarkupTest(unittest.TestCase):
- def condition_test(self):
- text = '''
-<CONDITION custom="unknown">
- <PERMISSION />
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</CONDITION>'''
- condition = Condition.from_string(text)
- tree = condition.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def permission_test(self):
- text = '''
-<PERMISSION custom="unknown">
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</CONDITION>'''
- permission = Permission.from_string(text)
- tree = permission.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def user_test(self):
- text = '''
-<USER custom="unknown">
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</USER>'''
- user = User.from_string(text)
- tree = user.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def return_test(self):
- text = '''
-<RETURN custom="unknown">
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</RETURN>'''
- ret = Return.from_string(text)
- tree = ret.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def security_list_test(self):
- text = '''
-<SECURITY custom="unknown">
- <CONDITION />
- <RETURN />
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</SECURITY>'''
- slist = SecurityList.from_string(text)
- tree = slist.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/misc/py_control_client/MyServer/pycontrollib/test/vhost_test.py
b/misc/py_control_client/MyServer/pycontrollib/test/vhost_test.py
deleted file mode 100644
index 7338ac6..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/test/vhost_test.py
+++ /dev/null
@@ -1,623 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-import unittest
-from vhost import VHost, VHosts
-from log import Log
-from lxml import etree
-
-class VHostTest(unittest.TestCase):
- def test_creation(self):
- vhost = VHost()
- vhost = VHost('test vhost')
- vhost = VHost('test vhost', 80)
- vhost = VHost('test vhost', 80, 'HTTP')
- vhost = VHost('test vhost', 80, 'HTTP', '/www')
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system')
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')])
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'])
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None})
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'private_key')
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'private_key', 'certificate')
-
- def test_name(self):
- vhost = VHost('test vhost')
- self.assertEqual('test vhost', vhost.get_name())
- vhost.set_name('vhost')
- self.assertEqual('vhost', vhost.get_name())
- vhost.set_name(None)
- self.assertEqual(None, vhost.get_name())
- vhost = VHost(name = 'test vhost')
- self.assertEqual('test vhost', vhost.get_name())
-
- def test_port(self):
- vhost = VHost('test vhost', 80)
- self.assertEqual(80, vhost.get_port())
- vhost.set_port(8080)
- self.assertEqual(8080, vhost.get_port())
- vhost.set_port(None)
- self.assertEqual(None, vhost.get_port())
- vhost = VHost(port = 80)
- self.assertEqual(80, vhost.get_port())
-
- def test_protocol(self):
- vhost = VHost('test vhost', 80, 'HTTP')
- self.assertEqual('HTTP', vhost.get_protocol())
- vhost.set_protocol('NEW PROTOCOL')
- self.assertEqual('NEW PROTOCOL', vhost.get_protocol())
- vhost.set_protocol(None)
- self.assertEqual(None, vhost.get_protocol())
- vhost = VHost(protocol = 'HTTP')
- self.assertEqual('HTTP', vhost.get_protocol())
-
- def test_doc_root(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www')
- self.assertEqual('/www', vhost.get_doc_root())
- vhost.set_doc_root('/var/www')
- self.assertEqual('/var/www', vhost.get_doc_root())
- vhost.set_doc_root(None)
- self.assertEqual(None, vhost.get_doc_root())
- vhost = VHost(doc_root = '/www')
- self.assertEqual('/www', vhost.get_doc_root())
-
- def test_sys_root(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system')
- self.assertEqual('/system', vhost.get_sys_root())
- vhost.set_sys_root('/var/system')
- self.assertEqual('/var/system', vhost.get_sys_root())
- vhost.set_sys_root(None)
- self.assertEqual(None, vhost.get_sys_root())
- vhost = VHost(sys_root = '/system')
- self.assertEqual('/system', vhost.get_sys_root())
-
- def test_logs(self):
- a_log = Log('ACCESSLOG')
- w_log = Log('WARNINGLOG')
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system', [a_log,
w_log])
- self.assertEqual([a_log, w_log], vhost.get_logs())
- vhost.add_log(a_log)
- self.assertEqual([a_log, w_log, a_log], vhost.get_logs())
- vhost.remove_log(0)
- self.assertEqual([w_log, a_log], vhost.get_logs())
- vhost.add_log(w_log, 0)
- self.assertEqual([w_log, w_log, a_log], vhost.get_logs())
- vhost = VHost(logs = [a_log, w_log])
- self.assertEqual([a_log, w_log], vhost.get_logs())
-
- def test_ip(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG')])
- self.assertEqual(set(), vhost.get_ip())
- vhost.add_ip('10.0.0.0/8')
- vhost.add_ip('192.168.0.0/16')
- self.assertEqual(set(['10.0.0.0/8', '192.168.0.0/16']), vhost.get_ip())
- vhost.remove_ip('10.0.0.0/8')
- self.assertEqual(set(['192.168.0.0/16']), vhost.get_ip())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'])
- self.assertEqual(set(['127.0.0.0/8', '192.168.0.0/16']),
vhost.get_ip())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ip = ['127.0.0.0/8', '192.168.0.0/16'])
- self.assertEqual(set(['127.0.0.0/8', '192.168.0.0/16']),
vhost.get_ip())
-
- def test_host(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG')])
- self.assertEqual({}, vhost.get_host())
- vhost.add_host('foo.bar.com', False)
- vhost.add_host('test.me.org')
- self.assertEqual({'foo.bar.com': False, 'test.me.org': None},
- vhost.get_host())
- vhost.remove_host('foo.bar.com')
- self.assertEqual({'test.me.org': None}, vhost.get_host())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'test.me.org': None})
- self.assertEqual({'test.me.org': None}, vhost.get_host())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- host = {'test.me.org': None})
- self.assertEqual({'test.me.org': None}, vhost.get_host())
-
- def test_private_key(self):
- vhost = VHost()
- self.assertEqual(None, vhost.get_private_key())
- vhost.set_private_key('path')
- self.assertEqual('path', vhost.get_private_key())
- vhost.set_private_key(None)
- self.assertEqual(None, vhost.get_private_key())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'path')
- self.assertEqual('path', vhost.get_private_key())
- vhost = VHost(private_key = 'path')
- self.assertEqual('path', vhost.get_private_key())
-
- def test_certificate(self):
- vhost = VHost()
- self.assertEqual(None, vhost.get_certificate())
- vhost.set_certificate('path')
- self.assertEqual('path', vhost.get_certificate())
- vhost.set_certificate(None)
- self.assertEqual(None, vhost.get_certificate())
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'key', 'path')
- self.assertEqual('path', vhost.get_certificate())
- vhost = VHost(certificate = 'path')
- self.assertEqual('path', vhost.get_certificate())
-
- def test_equality(self):
- vhost_0 = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'private_key', 'certificate')
- vhost_1 = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': None}, 'private_key', 'certificate')
- self.assertEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_name('different')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_port(81)
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_protocol('HTTPS')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_doc_root('/var/www')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_sys_root('/var/system')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.add_log(Log('NEWLOG'))
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.add_ip('10.0.0.0/8')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.add_host('newhost', None)
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_private_key('new_key')
- self.assertNotEqual(vhost_0, vhost_1)
- vhost_1 = VHost.from_string(str(vhost_0))
- vhost_1.set_certificate('new certificate')
- self.assertNotEqual(vhost_0, vhost_1)
- self.assertNotEqual(vhost_0, [])
-
- def test_from_string(self):
- text = '<VHOST />'
- vhost = VHost.from_string(text)
- right = VHost()
- self.assertEqual(vhost, right)
-
- def test_from_string_name(self):
- text = '<VHOST><NAME>test vhost</NAME></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost('test vhost')
- self.assertEqual(vhost, right)
-
- def test_from_string_port(self):
- text = '<VHOST><PORT>80</PORT></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(port = 80)
- self.assertEqual(vhost, right)
-
- def test_from_string_protocol(self):
- text = '<VHOST><PROTOCOL>HTTP</PROTOCOL></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(protocol = 'HTTP')
- self.assertEqual(vhost, right)
-
- def test_from_string_doc_root(self):
- text = '<VHOST><DOCROOT>/www</DOCROOT></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(doc_root = '/www')
- self.assertEqual(vhost, right)
-
- def test_from_string_sys_root(self):
- text = '<VHOST><SYSROOT>/system</SYSROOT></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(sys_root = '/system')
- self.assertEqual(vhost, right)
-
- def test_from_string_logs(self):
- text = '<VHOST><ACCESSLOG /><SOMELOG /></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(logs = [Log('ACCESSLOG'), Log('SOMELOG')])
- self.assertEqual(vhost, right)
-
- def test_from_string_ip(self):
- text = '<VHOST><IP>127.0.0.0/8</IP></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(ip = ['127.0.0.0/8'])
- self.assertEqual(vhost, right)
-
- def test_from_string_host(self):
- text = '<VHOST><HOST
useRegex="YES">.*</HOST><HOST>a.org</HOST></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(host = {'.*': True, 'a.org': None})
- self.assertEqual(vhost, right)
-
- def test_from_string_private_key(self):
- text = '<VHOST><SSL_PRIVATEKEY>private_key</SSL_PRIVATEKEY></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(private_key = 'private_key')
- self.assertEqual(vhost, right)
-
- def test_from_string_certificate(self):
- text = '<VHOST><SSL_CERTIFICATE>certificate</SSL_CERTIFICATE></VHOST>'
- vhost = VHost.from_string(text)
- right = VHost(certificate = 'certificate')
- self.assertEqual(vhost, right)
-
- def test_from_string_full(self):
- text = '''<VHOST>
- <NAME>test vhost</NAME>
- <PORT>80</PORT>
- <PROTOCOL>HTTP</PROTOCOL>
- <DOCROOT>/www</DOCROOT>
- <SYSROOT>/system</SYSROOT>
- <ACCESSLOG />
- <WARNINGLOG />
- <IP>127.0.0.0/8</IP>
- <IP>192.168.0.0/16</IP>
- <HOST useRegex="YES">host.domain</HOST>
- <HOST>test.domain</HOST>
- <SSL_PRIVATEKEY>private_key</SSL_PRIVATEKEY>
- <SSL_CERTIFICATE>certificate</SSL_CERTIFICATE>
-</VHOST>'''
- vhost = VHost.from_string(text)
- right = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': True, 'test.domain': None},
- 'private_key', 'certificate')
- self.assertEqual(vhost, right)
-
- def test_from_lxml(self):
- text = '<VHOST />'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost()
- self.assertEqual(vhost, right)
-
- def test_from_lxml_name(self):
- text = '<VHOST><NAME>test vhost</NAME></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost('test vhost')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_port(self):
- text = '<VHOST><PORT>80</PORT></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(port = 80)
- self.assertEqual(vhost, right)
-
- def test_from_lxml_protocol(self):
- text = '<VHOST><PROTOCOL>HTTP</PROTOCOL></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(protocol = 'HTTP')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_doc_root(self):
- text = '<VHOST><DOCROOT>/www</DOCROOT></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(doc_root = '/www')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_sys_folder(self):
- text = '<VHOST><SYSROOT>/system</SYSROOT></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(sys_root = '/system')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_logs(self):
- text = '<VHOST><ACCESSLOG /><SOMELOG /></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(logs = [Log('ACCESSLOG'), Log('SOMELOG')])
- self.assertEqual(vhost, right)
-
- def test_from_lxml_ip(self):
- text = '<VHOST><IP>127.0.0.0/8</IP></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(ip = ['127.0.0.0/8'])
- self.assertEqual(vhost, right)
-
- def test_from_lxml_host(self):
- text = '<VHOST><HOST
useRegex="YES">.*</HOST><HOST>a.org</HOST></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(host = {'.*': True, 'a.org': None})
- self.assertEqual(vhost, right)
-
- def test_from_lxml_private_key(self):
- text = '<VHOST><SSL_PRIVATEKEY>private_key</SSL_PRIVATEKEY></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(private_key = 'private_key')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_certificate(self):
- text = '<VHOST><SSL_CERTIFICATE>certificate</SSL_CERTIFICATE></VHOST>'
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost(certificate = 'certificate')
- self.assertEqual(vhost, right)
-
- def test_from_lxml_full(self):
- text = '''<VHOST>
- <NAME>test vhost</NAME>
- <PORT>80</PORT>
- <PROTOCOL>HTTP</PROTOCOL>
- <DOCROOT>/www</DOCROOT>
- <SYSROOT>/system</SYSROOT>
- <ACCESSLOG />
- <WARNINGLOG />
- <IP>127.0.0.0/8</IP>
- <IP>192.168.0.0/16</IP>
- <HOST useRegex="YES">host.domain</HOST>
- <HOST>test.domain</HOST>
- <SSL_PRIVATEKEY>private_key</SSL_PRIVATEKEY>
- <SSL_CERTIFICATE>certificate</SSL_CERTIFICATE>
-</VHOST>'''
- vhost = VHost.from_lxml_element(etree.XML(text))
- right = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': True, 'test.domain': None},
- 'private_key', 'certificate')
- self.assertEqual(vhost, right)
-
- def test_bad_root_tag(self):
- text = '<ERROR />'
- self.assertRaises(AttributeError, VHost.from_string, text)
- self.assertRaises(AttributeError, VHost.from_lxml_element,
- etree.XML(text))
-
- def test_to_string(self):
- vhost = VHost()
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_name(self):
- vhost = VHost('test vhost')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_port(self):
- vhost = VHost(port = 80)
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_protocol(self):
- vhost = VHost(protocol = 'HTTP')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_doc_root(self):
- vhost = VHost(doc_root = '/www')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_sys_root(self):
- vhost = VHost(sys_root = '/system')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_logs(self):
- vhost = VHost(logs = [Log('ACCESSLOG'), Log('SOMELOG')])
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_ip(self):
- vhost = VHost(ip = ['127.0.0.0/8'])
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_host(self):
- vhost = VHost(host = {'.*': True, 'a.org': None})
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_private_key(self):
- vhost = VHost(private_key = 'private_key')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_certificate(self):
- vhost = VHost(certificate = 'certificate')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_string_full(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': True, 'test.domain': None},
- 'private_key', 'certificate')
- copy = VHost.from_string(str(vhost))
- self.assertEqual(vhost, copy)
-
- def test_to_lxml(self):
- vhost = VHost()
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_name(self):
- vhost = VHost('test vhost')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_port(self):
- vhost = VHost(port = 80)
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_protocol(self):
- vhost = VHost(protocol = 'HTTP')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_doc_root(self):
- vhost = VHost(doc_root = '/www')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_sys_root(self):
- vhost = VHost(sys_root = '/system')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_logs(self):
- vhost = VHost(logs = [Log('ACCESSLOG'), Log('SOMELOG')])
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_ip(self):
- vhost = VHost(ip = ['127.0.0.0/8'])
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_host(self):
- vhost = VHost(host = {'.*': True, 'a.org': None})
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_private_key(self):
- vhost = VHost(private_key = 'private_key')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_certificate(self):
- vhost = VHost(certificate = 'certificate')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
- def test_to_lxml_full(self):
- vhost = VHost('test vhost', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': True, 'test.domain': None},
- 'private_key', 'certificate')
- copy = VHost.from_lxml_element(vhost.to_lxml_element())
- self.assertEqual(vhost, copy)
-
-class VHostsTest(unittest.TestCase):
- def setUp(self):
- self.vhost_0 = VHost('vhost 0', 80, 'HTTP', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')],
- ['127.0.0.0/8', '192.168.0.0/16'],
- {'host.domain': True, 'test.domain': None})
- self.vhost_1 = VHost('vhost 1', 443, 'HTTPS', '/www', '/system',
- [Log('ACCESSLOG'), Log('WARNINGLOG')])
- self.text = '<VHOSTS>{0}{1}</VHOSTS>'.format(str(self.vhost_0),
- str(self.vhost_1))
-
- def test_creation(self):
- vhosts = VHosts([self.vhost_0, self.vhost_1])
- self.assertEqual(vhosts.VHosts[0], self.vhost_0)
- self.assertEqual(vhosts.VHosts[1], self.vhost_1)
-
- def test_from_string(self):
- vhosts = VHosts.from_string(self.text)
- self.assertEqual(vhosts.VHosts[0], self.vhost_0)
- self.assertEqual(vhosts.VHosts[1], self.vhost_1)
-
- def test_from_string(self):
- vhosts = VHosts.from_lxml_element(etree.XML(self.text))
- self.assertEqual(vhosts.VHosts[0], self.vhost_0)
- self.assertEqual(vhosts.VHosts[1], self.vhost_1)
-
- def test_to_string(self):
- vhosts = VHosts.from_string(self.text)
- copy = VHosts.from_string(str(vhosts))
- self.assertEqual(vhosts, copy)
-
- def test_to_lxml(self):
- vhosts = VHosts.from_string(self.text)
- copy = VHosts.from_lxml_element(vhosts.to_lxml_element())
- self.assertEqual(vhosts, copy)
-
- def test_equality(self):
- self.assertEqual(VHosts.from_string(self.text),
- VHosts.from_string(self.text))
- self.assertNotEqual(VHosts.from_string(self.text),
- VHosts.from_string(
- '<VHOSTS>{0}</VHOSTS>'.format(str(self.vhost_0))))
- self.assertNotEqual(VHosts.from_string(self.text), [])
-
-class BadMarkupTest(unittest.TestCase):
- def test_vhost(self):
- text = '''
-<VHOST custom="unknown">
- <PORT>123</PORT>
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</VHOST>'''
- vhost = VHost.from_string(text)
- tree = vhost.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
- def test_vhosts(self):
- text = '''
-<VHOSTS custom="unknown">
- <VHOST />
- <UNKNOWN>
- <CUSTOM />
- </UNKNOWN>
-</VHOSTS>'''
- vhosts = VHosts.from_string(text)
- tree = vhosts.to_lxml_element()
- self.assertEqual('unknown', tree.get('custom'))
- self.assertEqual(1, len(tree.findall('VHOST')))
- unknown = tree.findall('UNKNOWN')
- self.assertEqual(1, len(unknown))
- unknown = unknown[0]
- custom = list(unknown)
- self.assertEqual(1, len(custom))
- custom = custom[0]
- self.assertEqual('CUSTOM', custom.tag)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/misc/py_control_client/MyServer/pycontrollib/vhost.py
b/misc/py_control_client/MyServer/pycontrollib/vhost.py
deleted file mode 100644
index 7564d67..0000000
--- a/misc/py_control_client/MyServer/pycontrollib/vhost.py
+++ /dev/null
@@ -1,306 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from lxml import etree
-from log import Log
-
-class VHost():
- def __init__(self, name = None, port = None, protocol = None,
- doc_root = None, sys_root = None, logs = [],
- ip = [], host = {}, private_key = None, certificate = None):
- '''Create new instance of VHost. logs and ip are expected to be a
- collection and host is expected to be a dict {name: useRegex} where
None
- means not set.'''
- self.set_name(name)
- self.set_port(port)
- self.set_protocol(protocol)
- self.set_doc_root(doc_root)
- self.set_sys_root(sys_root)
- self.logs = []
- for log in logs:
- self.add_log(log)
- self.ip = set()
- for ip_address in ip:
- self.add_ip(ip_address)
- self.host = {}
- for single_host in host.iteritems():
- self.add_host(single_host[0], single_host[1])
- self.set_private_key(private_key)
- self.set_certificate(certificate)
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, VHost) and self.name == other.name and \
- self.port == other.port and self.protocol == other.protocol and \
- self.doc_root == other.doc_root and \
- self.sys_root == other.sys_root and \
- self.logs == other.logs and self.ip == other.ip and \
- self.host == other.host and \
- self.private_key == other.private_key and \
- self.certificate == other.certificate
-
- def get_name(self):
- '''Get VHost name.'''
- return self.name
-
- def set_name(self, name):
- '''Set VHost name.'''
- self.name = name
-
- def get_doc_root(self):
- '''Get VHost doc root.'''
- return self.doc_root
-
- def set_doc_root(self, doc_root):
- '''Set VHost doc root.'''
- self.doc_root = doc_root
-
- def get_sys_root(self):
- '''Get VHost sys root.'''
- return self.sys_root
-
- def set_sys_root(self, sys_root):
- '''Set VHost sys root.'''
- self.sys_root = sys_root
-
- def get_protocol(self):
- '''Get VHost protocol.'''
- return self.protocol
-
- def set_protocol(self, protocol):
- '''Set VHost protocol.'''
- self.protocol = protocol
-
- def get_port(self):
- '''Get VHost port.'''
- return self.port
-
- def set_port(self, port):
- '''Set VHost port.'''
- if port is None:
- self.port = None
- else:
- self.port = int(port)
-
- def get_logs(self):
- '''Get list of logs.'''
- return self.logs
-
- def get_log(self, index):
- '''Get index-th log.'''
- return self.logs[index]
-
- def remove_log(self, index):
- '''Remove index-th log.'''
- self.logs.pop(index)
-
- def add_log(self, log, index = None):
- '''Add log to VHost's logs, if index is None append it, otherwise
insert
- at index position.'''
- if index is None:
- self.logs.append(log)
- else:
- self.logs.insert(index, log)
-
- def get_ip(self):
- '''Get VHost ip set.'''
- return self.ip
-
- def add_ip(self, ip):
- '''Add ip to VHost ip set.'''
- self.ip.add(ip)
-
- def remove_ip(self, ip):
- '''Remove ip from VHost ip set.'''
- self.ip.remove(ip)
-
- def get_host(self):
- '''Get VHost host dict.'''
- return self.host
-
- def add_host(self, host, use_regex = None):
- '''Add host to VHost host dict.'''
- self.host[host] = use_regex
-
- def remove_host(self, host):
- '''Remove host from VHost host dict.'''
- self.host.pop(host)
-
- def get_private_key(self):
- '''Get vhost private ssl key.'''
- return self.private_key
-
- def set_private_key(self, private_key):
- '''Set vhost private ssl key.'''
- self.private_key = private_key
-
- def get_certificate(self):
- '''Get vhost ssl certificate.'''
- return self.certificate
-
- def set_certificate(self, certificate):
- '''Set vhost ssl certificate.'''
- self.certificate = certificate
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- def to_lxml_element(self):
- '''Convert to instance of lxml.etree.Element.'''
- def make_element(tag, text):
- element = etree.Element(tag)
- element.text = text
- return element
- root = etree.Element('VHOST')
- if self.name is not None:
- root.append(make_element('NAME', self.name))
- if self.port is not None:
- root.append(make_element('PORT', str(self.port)))
- if self.protocol is not None:
- root.append(make_element('PROTOCOL', self.protocol))
- if self.doc_root is not None:
- root.append(make_element('DOCROOT', self.doc_root))
- if self.sys_root is not None:
- root.append(make_element('SYSROOT', self.sys_root))
- if self.private_key is not None:
- root.append(make_element('SSL_PRIVATEKEY', self.private_key))
- if self.certificate is not None:
- root.append(make_element('SSL_CERTIFICATE', self.certificate))
- for ip_address in self.ip:
- root.append(make_element('IP', ip_address))
- for host, use_regex in self.host.iteritems():
- element = make_element('HOST', host)
- if use_regex is not None:
- element.set('useRegex', 'YES' if use_regex else 'NO')
- root.append(element)
- for log in self.logs:
- root.append(log.to_lxml_element())
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce VHost from lxml.etree.Element object.'''
- if root.tag != 'VHOST':
- raise AttributeError('Expected VHOST tag.')
- custom_attrib = root.attrib
- name = None
- port = None
- protocol = None
- doc_root = None
- sys_root = None
- private_key = None
- certificate = None
- ip = []
- host = {}
- logs = []
- custom = []
- for child in list(root):
- if child.tag == 'NAME':
- name = child.text
- elif child.tag == 'PORT':
- port = child.text
- elif child.tag == 'PROTOCOL':
- protocol = child.text
- elif child.tag == 'DOCROOT':
- doc_root = child.text
- elif child.tag == 'SYSROOT':
- sys_root = child.text
- elif child.tag == 'IP':
- ip.append(child.text)
- elif child.tag == 'HOST':
- use_regex = child.get('useRegex', None)
- if use_regex is not None:
- use_regex = use_regex.upper() == 'YES'
- host[child.text] = use_regex
- elif child.tag == 'SSL_PRIVATEKEY':
- private_key = child.text
- elif child.tag == 'SSL_CERTIFICATE':
- certificate = child.text
- else:
- try:
- logs.append(Log.from_lxml_element(child))
- except AttributeError:
- custom.append(child)
- vhost = VHost(name, port, protocol, doc_root, sys_root, logs, ip, host,
- private_key, certificate)
- vhost.custom = custom
- vhost.custom_attrib = custom_attrib
- return vhost
-
- @staticmethod
- def from_string(text):
- '''Factory to produce VHost by parsing a string.'''
- return VHost.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
-
-class VHosts():
- def __init__(self, VHosts):
- '''Create a new instance of VHosts. VHosts attribute is expected to be
a
- list.'''
- self.VHosts = VHosts
- self.custom = []
- self.custom_attrib = {}
-
- def __eq__(self, other):
- return isinstance(other, VHosts) and self.VHosts == other.VHosts
-
- def to_lxml_element(self):
- '''Convert to lxml.etree.Element.'''
- root = etree.Element('VHOSTS')
- for vhost in self.VHosts:
- root.append(vhost.to_lxml_element())
-
- for element in self.custom:
- root.append(element)
- for key, value in self.custom_attrib.iteritems():
- root.set(key, value)
-
- return root
-
- def __str__(self):
- return etree.tostring(self.to_lxml_element(), pretty_print = True)
-
- @staticmethod
- def from_lxml_element(root):
- '''Factory to produce VHosts from lxml.etree.Element object.'''
- if root.tag != 'VHOSTS':
- raise AttributeError('Expected VHOSTS tag.')
- vhosts = []
- custom = []
- for element in list(root):
- try:
- vhosts.append(VHost.from_lxml_element(element))
- except AttributeError:
- custom.append(element)
- vhosts = VHosts(vhosts)
- vhosts.custom = custom
- vhosts.custom_attrib = root.attrib
- return vhosts
-
- @staticmethod
- def from_string(text):
- '''Factory to produce VHosts from parsing a string.'''
- return VHosts.from_lxml_element(etree.XML(
- text, parser = etree.XMLParser(remove_comments = True)))
diff --git a/misc/py_control_client/MyServer/sample.py
b/misc/py_control_client/MyServer/sample.py
deleted file mode 100644
index bb68163..0000000
--- a/misc/py_control_client/MyServer/sample.py
+++ /dev/null
@@ -1,40 +0,0 @@
-'''
-MyServer
-Copyright (C) 2008 The MyServer Team
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from pycontrol.pycontrol import PyMyServerControl
-from pycontrol.pycontrol import error_codes
-
-from sys import argv, exit
-
-if __name__ == "__main__":
- if len(argv) < 5:
- print "Not enough arguments\nUsage python test.py hostname port
username password"
- sys.exit(1)
-
- control = PyMyServerControl(argv[1], int(argv[2]), argv[3], argv[4])
-
- control.send_header("SHOWCONNECTIONS", 0)
-
- control.read_header()
-
- print "Reply code: " + error_codes.get(control.response_code)
-
- while control.available_data() > 0:
- print control.read()
-
-
- control.close()
diff --git a/misc/py_control_client/setup.py b/misc/py_control_client/setup.py
deleted file mode 100644
index f327e72..0000000
--- a/misc/py_control_client/setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-'''
-MyServer
-Copyright (C) 2009 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-'''
-
-from distutils.core import setup
-setup(name = 'MyServer', version = '0.0',
- py_modules = ['MyServer.__init__'],
- packages = ['MyServer/pycontrol', 'MyServer/pycontrollib',
'MyServer.GUI'])
-----------------------------------------------------------------------
Summary of changes:
misc/PyGTK_Control/MyServerControl.py | 461 -------
misc/PyGTK_Control/PyGTKControl.glade | 1436 --------------------
misc/py_control_client/INSTALL | 11 -
misc/py_control_client/MyServer/GUI/AboutWindow.py | 31 -
.../MyServer/GUI/BrowserWidgets.py | 80 --
.../MyServer/GUI/ConnectionWindow.py | 45 -
.../MyServer/GUI/DefinitionWidgets.py | 304 -----
misc/py_control_client/MyServer/GUI/GUIConfig.py | 91 --
misc/py_control_client/MyServer/GUI/MIMEWidgets.py | 204 ---
.../MyServer/GUI/SecurityWidgets.py | 732 ----------
.../py_control_client/MyServer/GUI/VHostWidgets.py | 515 -------
misc/py_control_client/MyServer/GUI/__init__.py | 2 -
misc/py_control_client/MyServer/README | 2 -
misc/py_control_client/MyServer/__init__.py | 2 -
.../MyServer/pycontrol/__init__.py | 2 -
.../MyServer/pycontrol/pycontrol.py | 115 --
.../MyServer/pycontrollib/__init__.py | 1 -
.../MyServer/pycontrollib/browser.py | 86 --
.../MyServer/pycontrollib/config.py | 70 -
.../MyServer/pycontrollib/controller.py | 145 --
.../MyServer/pycontrollib/definition.py | 252 ----
.../py_control_client/MyServer/pycontrollib/log.py | 242 ----
.../MyServer/pycontrollib/mimetypes.py | 270 ----
.../MyServer/pycontrollib/security.py | 474 -------
.../MyServer/pycontrollib/test/Makefile | 45 -
.../MyServer/pycontrollib/test/config_test.py | 134 --
.../MyServer/pycontrollib/test/definition_test.py | 481 -------
.../MyServer/pycontrollib/test/log_test.py | 425 ------
.../MyServer/pycontrollib/test/mimetypes_test.py | 484 -------
.../MyServer/pycontrollib/test/security_test.py | 1122 ---------------
.../MyServer/pycontrollib/test/vhost_test.py | 623 ---------
.../MyServer/pycontrollib/vhost.py | 306 -----
misc/py_control_client/MyServer/sample.py | 40 -
misc/py_control_client/setup.py | 22 -
34 files changed, 0 insertions(+), 9255 deletions(-)
delete mode 100644 misc/PyGTK_Control/MyServerControl.py
delete mode 100644 misc/PyGTK_Control/PyGTKControl.glade
delete mode 100644 misc/py_control_client/INSTALL
delete mode 100644 misc/py_control_client/MyServer/GUI/AboutWindow.py
delete mode 100644 misc/py_control_client/MyServer/GUI/BrowserWidgets.py
delete mode 100644 misc/py_control_client/MyServer/GUI/ConnectionWindow.py
delete mode 100644 misc/py_control_client/MyServer/GUI/DefinitionWidgets.py
delete mode 100644 misc/py_control_client/MyServer/GUI/GUIConfig.py
delete mode 100644 misc/py_control_client/MyServer/GUI/MIMEWidgets.py
delete mode 100644 misc/py_control_client/MyServer/GUI/SecurityWidgets.py
delete mode 100644 misc/py_control_client/MyServer/GUI/VHostWidgets.py
delete mode 100644 misc/py_control_client/MyServer/GUI/__init__.py
delete mode 100644 misc/py_control_client/MyServer/README
delete mode 100644 misc/py_control_client/MyServer/__init__.py
delete mode 100644 misc/py_control_client/MyServer/pycontrol/__init__.py
delete mode 100644 misc/py_control_client/MyServer/pycontrol/pycontrol.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/__init__.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/browser.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/config.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/controller.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/definition.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/log.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/mimetypes.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/security.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/test/Makefile
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/config_test.py
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/definition_test.py
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/log_test.py
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/mimetypes_test.py
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/security_test.py
delete mode 100644
misc/py_control_client/MyServer/pycontrollib/test/vhost_test.py
delete mode 100644 misc/py_control_client/MyServer/pycontrollib/vhost.py
delete mode 100644 misc/py_control_client/MyServer/sample.py
delete mode 100644 misc/py_control_client/setup.py
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. dcef300aaa5c994c08554001464a1630ca117081,
Marek Aaron Sapota <=