From b86a926eae29e9365ad43cd0adde7431358cd12b Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 2 Oct 2014 11:19:53 +0400 Subject: [PATCH] Module refactoring --- {calculate => pym/calculate}/__init__.py | 0 {calculate => pym/calculate}/install_data.py | 0 {calculate => pym/calculate}/lib/__init__.py | 0 {calculate => pym/calculate}/lib/cl_fill.py | 0 {calculate => pym/calculate}/lib/cl_lang.py | 0 {calculate => pym/calculate}/lib/cl_ldap.py | 0 {calculate => pym/calculate}/lib/cl_log.py | 0 .../calculate}/lib/cl_overriding.py | 0 {calculate => pym/calculate}/lib/cl_print.py | 0 .../calculate}/lib/cl_progressbar.py | 0 .../calculate}/lib/cl_template.py | 0 {calculate => pym/calculate}/lib/cl_vars.py | 0 .../calculate}/lib/cl_vars_share.py | 0 .../calculate}/lib/client/__init__.py | 0 .../calculate}/lib/client/progressbar.py | 0 .../calculate}/lib/convertenv.py | 0 {calculate => pym/calculate}/lib/datavars.py | 0 {calculate => pym/calculate}/lib/encrypt.py | 0 .../calculate}/lib/format/__init__.py | 0 .../calculate}/lib/format/apache.py | 0 .../calculate}/lib/format/bind.py | 0 .../calculate}/lib/format/compiz.py | 0 .../calculate}/lib/format/dhcp.py | 0 .../calculate}/lib/format/diff.py | 0 .../calculate}/lib/format/dovecot.py | 0 .../calculate}/lib/format/kde.py | 0 .../calculate}/lib/format/ldap.py | 0 .../calculate}/lib/format/openrc.py | 0 .../calculate}/lib/format/patch.py | 0 .../calculate}/lib/format/plasma.py | 0 .../calculate}/lib/format/postfix.py | 0 .../calculate}/lib/format/procmail.py | 0 .../calculate}/lib/format/samba.py | 0 .../calculate}/lib/format/squid.py | 0 .../calculate}/lib/format/world.py | 0 .../calculate}/lib/format/xml_gconf.py | 0 .../calculate}/lib/format/xml_gconf_tree.py | 0 .../calculate}/lib/format/xml_xfce.py | 0 .../calculate}/lib/format/xml_xfcepanel.py | 0 .../calculate}/lib/mod/__init__.py | 0 .../calculate}/lib/server/__init__.py | 0 .../calculate}/lib/server/utils.py | 0 .../calculate}/lib/utils/__init__.py | 0 .../lib/utils/colortext/__init__.py | 0 .../lib/utils/colortext/converter.py | 0 .../calculate}/lib/utils/colortext/info.py | 0 .../calculate}/lib/utils/colortext/output.py | 0 .../calculate}/lib/utils/colortext/palette.py | 0 .../lib/utils/colortext/printing.py | 0 .../calculate}/lib/utils/common.py | 0 .../calculate}/lib/utils/content.py | 0 .../calculate}/lib/utils/device.py | 0 .../calculate}/lib/utils/files.py | 0 {calculate => pym/calculate}/lib/utils/ip.py | 0 .../calculate}/lib/utils/portage.py | 0 .../calculate}/lib/utils/text.py | 0 .../calculate}/lib/utils/tools.py | 0 .../calculate}/lib/variables/X11.py | 0 .../calculate}/lib/variables/__init__.py | 0 .../calculate}/lib/variables/action.py | 0 .../calculate}/lib/variables/env.py | 0 .../calculate}/lib/variables/hardware.py | 0 .../calculate}/lib/variables/linux.py | 0 .../calculate}/lib/variables/locale.py | 0 .../calculate}/lib/variables/net.py | 0 .../calculate}/lib/variables/system.py | 0 .../calculate}/lib/variables/user.py | 0 setup.cfg | 2 -- setup.py | 24 +++++++++++-------- 69 files changed, 14 insertions(+), 12 deletions(-) rename {calculate => pym/calculate}/__init__.py (100%) rename {calculate => pym/calculate}/install_data.py (100%) rename {calculate => pym/calculate}/lib/__init__.py (100%) rename {calculate => pym/calculate}/lib/cl_fill.py (100%) rename {calculate => pym/calculate}/lib/cl_lang.py (100%) rename {calculate => pym/calculate}/lib/cl_ldap.py (100%) rename {calculate => pym/calculate}/lib/cl_log.py (100%) rename {calculate => pym/calculate}/lib/cl_overriding.py (100%) rename {calculate => pym/calculate}/lib/cl_print.py (100%) rename {calculate => pym/calculate}/lib/cl_progressbar.py (100%) rename {calculate => pym/calculate}/lib/cl_template.py (100%) rename {calculate => pym/calculate}/lib/cl_vars.py (100%) rename {calculate => pym/calculate}/lib/cl_vars_share.py (100%) rename {calculate => pym/calculate}/lib/client/__init__.py (100%) rename {calculate => pym/calculate}/lib/client/progressbar.py (100%) rename {calculate => pym/calculate}/lib/convertenv.py (100%) rename {calculate => pym/calculate}/lib/datavars.py (100%) rename {calculate => pym/calculate}/lib/encrypt.py (100%) rename {calculate => pym/calculate}/lib/format/__init__.py (100%) rename {calculate => pym/calculate}/lib/format/apache.py (100%) rename {calculate => pym/calculate}/lib/format/bind.py (100%) rename {calculate => pym/calculate}/lib/format/compiz.py (100%) rename {calculate => pym/calculate}/lib/format/dhcp.py (100%) rename {calculate => pym/calculate}/lib/format/diff.py (100%) rename {calculate => pym/calculate}/lib/format/dovecot.py (100%) rename {calculate => pym/calculate}/lib/format/kde.py (100%) rename {calculate => pym/calculate}/lib/format/ldap.py (100%) rename {calculate => pym/calculate}/lib/format/openrc.py (100%) rename {calculate => pym/calculate}/lib/format/patch.py (100%) rename {calculate => pym/calculate}/lib/format/plasma.py (100%) rename {calculate => pym/calculate}/lib/format/postfix.py (100%) rename {calculate => pym/calculate}/lib/format/procmail.py (100%) rename {calculate => pym/calculate}/lib/format/samba.py (100%) rename {calculate => pym/calculate}/lib/format/squid.py (100%) rename {calculate => pym/calculate}/lib/format/world.py (100%) rename {calculate => pym/calculate}/lib/format/xml_gconf.py (100%) rename {calculate => pym/calculate}/lib/format/xml_gconf_tree.py (100%) rename {calculate => pym/calculate}/lib/format/xml_xfce.py (100%) rename {calculate => pym/calculate}/lib/format/xml_xfcepanel.py (100%) rename {calculate => pym/calculate}/lib/mod/__init__.py (100%) rename {calculate => pym/calculate}/lib/server/__init__.py (100%) rename {calculate => pym/calculate}/lib/server/utils.py (100%) rename {calculate => pym/calculate}/lib/utils/__init__.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/__init__.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/converter.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/info.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/output.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/palette.py (100%) rename {calculate => pym/calculate}/lib/utils/colortext/printing.py (100%) rename {calculate => pym/calculate}/lib/utils/common.py (100%) rename {calculate => pym/calculate}/lib/utils/content.py (100%) rename {calculate => pym/calculate}/lib/utils/device.py (100%) rename {calculate => pym/calculate}/lib/utils/files.py (100%) rename {calculate => pym/calculate}/lib/utils/ip.py (100%) rename {calculate => pym/calculate}/lib/utils/portage.py (100%) rename {calculate => pym/calculate}/lib/utils/text.py (100%) rename {calculate => pym/calculate}/lib/utils/tools.py (100%) rename {calculate => pym/calculate}/lib/variables/X11.py (100%) rename {calculate => pym/calculate}/lib/variables/__init__.py (100%) rename {calculate => pym/calculate}/lib/variables/action.py (100%) rename {calculate => pym/calculate}/lib/variables/env.py (100%) rename {calculate => pym/calculate}/lib/variables/hardware.py (100%) rename {calculate => pym/calculate}/lib/variables/linux.py (100%) rename {calculate => pym/calculate}/lib/variables/locale.py (100%) rename {calculate => pym/calculate}/lib/variables/net.py (100%) rename {calculate => pym/calculate}/lib/variables/system.py (100%) rename {calculate => pym/calculate}/lib/variables/user.py (100%) delete mode 100644 setup.cfg diff --git a/calculate/__init__.py b/pym/calculate/__init__.py similarity index 100% rename from calculate/__init__.py rename to pym/calculate/__init__.py diff --git a/calculate/install_data.py b/pym/calculate/install_data.py similarity index 100% rename from calculate/install_data.py rename to pym/calculate/install_data.py diff --git a/calculate/lib/__init__.py b/pym/calculate/lib/__init__.py similarity index 100% rename from calculate/lib/__init__.py rename to pym/calculate/lib/__init__.py diff --git a/calculate/lib/cl_fill.py b/pym/calculate/lib/cl_fill.py similarity index 100% rename from calculate/lib/cl_fill.py rename to pym/calculate/lib/cl_fill.py diff --git a/calculate/lib/cl_lang.py b/pym/calculate/lib/cl_lang.py similarity index 100% rename from calculate/lib/cl_lang.py rename to pym/calculate/lib/cl_lang.py diff --git a/calculate/lib/cl_ldap.py b/pym/calculate/lib/cl_ldap.py similarity index 100% rename from calculate/lib/cl_ldap.py rename to pym/calculate/lib/cl_ldap.py diff --git a/calculate/lib/cl_log.py b/pym/calculate/lib/cl_log.py similarity index 100% rename from calculate/lib/cl_log.py rename to pym/calculate/lib/cl_log.py diff --git a/calculate/lib/cl_overriding.py b/pym/calculate/lib/cl_overriding.py similarity index 100% rename from calculate/lib/cl_overriding.py rename to pym/calculate/lib/cl_overriding.py diff --git a/calculate/lib/cl_print.py b/pym/calculate/lib/cl_print.py similarity index 100% rename from calculate/lib/cl_print.py rename to pym/calculate/lib/cl_print.py diff --git a/calculate/lib/cl_progressbar.py b/pym/calculate/lib/cl_progressbar.py similarity index 100% rename from calculate/lib/cl_progressbar.py rename to pym/calculate/lib/cl_progressbar.py diff --git a/calculate/lib/cl_template.py b/pym/calculate/lib/cl_template.py similarity index 100% rename from calculate/lib/cl_template.py rename to pym/calculate/lib/cl_template.py diff --git a/calculate/lib/cl_vars.py b/pym/calculate/lib/cl_vars.py similarity index 100% rename from calculate/lib/cl_vars.py rename to pym/calculate/lib/cl_vars.py diff --git a/calculate/lib/cl_vars_share.py b/pym/calculate/lib/cl_vars_share.py similarity index 100% rename from calculate/lib/cl_vars_share.py rename to pym/calculate/lib/cl_vars_share.py diff --git a/calculate/lib/client/__init__.py b/pym/calculate/lib/client/__init__.py similarity index 100% rename from calculate/lib/client/__init__.py rename to pym/calculate/lib/client/__init__.py diff --git a/calculate/lib/client/progressbar.py b/pym/calculate/lib/client/progressbar.py similarity index 100% rename from calculate/lib/client/progressbar.py rename to pym/calculate/lib/client/progressbar.py diff --git a/calculate/lib/convertenv.py b/pym/calculate/lib/convertenv.py similarity index 100% rename from calculate/lib/convertenv.py rename to pym/calculate/lib/convertenv.py diff --git a/calculate/lib/datavars.py b/pym/calculate/lib/datavars.py similarity index 100% rename from calculate/lib/datavars.py rename to pym/calculate/lib/datavars.py diff --git a/calculate/lib/encrypt.py b/pym/calculate/lib/encrypt.py similarity index 100% rename from calculate/lib/encrypt.py rename to pym/calculate/lib/encrypt.py diff --git a/calculate/lib/format/__init__.py b/pym/calculate/lib/format/__init__.py similarity index 100% rename from calculate/lib/format/__init__.py rename to pym/calculate/lib/format/__init__.py diff --git a/calculate/lib/format/apache.py b/pym/calculate/lib/format/apache.py similarity index 100% rename from calculate/lib/format/apache.py rename to pym/calculate/lib/format/apache.py diff --git a/calculate/lib/format/bind.py b/pym/calculate/lib/format/bind.py similarity index 100% rename from calculate/lib/format/bind.py rename to pym/calculate/lib/format/bind.py diff --git a/calculate/lib/format/compiz.py b/pym/calculate/lib/format/compiz.py similarity index 100% rename from calculate/lib/format/compiz.py rename to pym/calculate/lib/format/compiz.py diff --git a/calculate/lib/format/dhcp.py b/pym/calculate/lib/format/dhcp.py similarity index 100% rename from calculate/lib/format/dhcp.py rename to pym/calculate/lib/format/dhcp.py diff --git a/calculate/lib/format/diff.py b/pym/calculate/lib/format/diff.py similarity index 100% rename from calculate/lib/format/diff.py rename to pym/calculate/lib/format/diff.py diff --git a/calculate/lib/format/dovecot.py b/pym/calculate/lib/format/dovecot.py similarity index 100% rename from calculate/lib/format/dovecot.py rename to pym/calculate/lib/format/dovecot.py diff --git a/calculate/lib/format/kde.py b/pym/calculate/lib/format/kde.py similarity index 100% rename from calculate/lib/format/kde.py rename to pym/calculate/lib/format/kde.py diff --git a/calculate/lib/format/ldap.py b/pym/calculate/lib/format/ldap.py similarity index 100% rename from calculate/lib/format/ldap.py rename to pym/calculate/lib/format/ldap.py diff --git a/calculate/lib/format/openrc.py b/pym/calculate/lib/format/openrc.py similarity index 100% rename from calculate/lib/format/openrc.py rename to pym/calculate/lib/format/openrc.py diff --git a/calculate/lib/format/patch.py b/pym/calculate/lib/format/patch.py similarity index 100% rename from calculate/lib/format/patch.py rename to pym/calculate/lib/format/patch.py diff --git a/calculate/lib/format/plasma.py b/pym/calculate/lib/format/plasma.py similarity index 100% rename from calculate/lib/format/plasma.py rename to pym/calculate/lib/format/plasma.py diff --git a/calculate/lib/format/postfix.py b/pym/calculate/lib/format/postfix.py similarity index 100% rename from calculate/lib/format/postfix.py rename to pym/calculate/lib/format/postfix.py diff --git a/calculate/lib/format/procmail.py b/pym/calculate/lib/format/procmail.py similarity index 100% rename from calculate/lib/format/procmail.py rename to pym/calculate/lib/format/procmail.py diff --git a/calculate/lib/format/samba.py b/pym/calculate/lib/format/samba.py similarity index 100% rename from calculate/lib/format/samba.py rename to pym/calculate/lib/format/samba.py diff --git a/calculate/lib/format/squid.py b/pym/calculate/lib/format/squid.py similarity index 100% rename from calculate/lib/format/squid.py rename to pym/calculate/lib/format/squid.py diff --git a/calculate/lib/format/world.py b/pym/calculate/lib/format/world.py similarity index 100% rename from calculate/lib/format/world.py rename to pym/calculate/lib/format/world.py diff --git a/calculate/lib/format/xml_gconf.py b/pym/calculate/lib/format/xml_gconf.py similarity index 100% rename from calculate/lib/format/xml_gconf.py rename to pym/calculate/lib/format/xml_gconf.py diff --git a/calculate/lib/format/xml_gconf_tree.py b/pym/calculate/lib/format/xml_gconf_tree.py similarity index 100% rename from calculate/lib/format/xml_gconf_tree.py rename to pym/calculate/lib/format/xml_gconf_tree.py diff --git a/calculate/lib/format/xml_xfce.py b/pym/calculate/lib/format/xml_xfce.py similarity index 100% rename from calculate/lib/format/xml_xfce.py rename to pym/calculate/lib/format/xml_xfce.py diff --git a/calculate/lib/format/xml_xfcepanel.py b/pym/calculate/lib/format/xml_xfcepanel.py similarity index 100% rename from calculate/lib/format/xml_xfcepanel.py rename to pym/calculate/lib/format/xml_xfcepanel.py diff --git a/calculate/lib/mod/__init__.py b/pym/calculate/lib/mod/__init__.py similarity index 100% rename from calculate/lib/mod/__init__.py rename to pym/calculate/lib/mod/__init__.py diff --git a/calculate/lib/server/__init__.py b/pym/calculate/lib/server/__init__.py similarity index 100% rename from calculate/lib/server/__init__.py rename to pym/calculate/lib/server/__init__.py diff --git a/calculate/lib/server/utils.py b/pym/calculate/lib/server/utils.py similarity index 100% rename from calculate/lib/server/utils.py rename to pym/calculate/lib/server/utils.py diff --git a/calculate/lib/utils/__init__.py b/pym/calculate/lib/utils/__init__.py similarity index 100% rename from calculate/lib/utils/__init__.py rename to pym/calculate/lib/utils/__init__.py diff --git a/calculate/lib/utils/colortext/__init__.py b/pym/calculate/lib/utils/colortext/__init__.py similarity index 100% rename from calculate/lib/utils/colortext/__init__.py rename to pym/calculate/lib/utils/colortext/__init__.py diff --git a/calculate/lib/utils/colortext/converter.py b/pym/calculate/lib/utils/colortext/converter.py similarity index 100% rename from calculate/lib/utils/colortext/converter.py rename to pym/calculate/lib/utils/colortext/converter.py diff --git a/calculate/lib/utils/colortext/info.py b/pym/calculate/lib/utils/colortext/info.py similarity index 100% rename from calculate/lib/utils/colortext/info.py rename to pym/calculate/lib/utils/colortext/info.py diff --git a/calculate/lib/utils/colortext/output.py b/pym/calculate/lib/utils/colortext/output.py similarity index 100% rename from calculate/lib/utils/colortext/output.py rename to pym/calculate/lib/utils/colortext/output.py diff --git a/calculate/lib/utils/colortext/palette.py b/pym/calculate/lib/utils/colortext/palette.py similarity index 100% rename from calculate/lib/utils/colortext/palette.py rename to pym/calculate/lib/utils/colortext/palette.py diff --git a/calculate/lib/utils/colortext/printing.py b/pym/calculate/lib/utils/colortext/printing.py similarity index 100% rename from calculate/lib/utils/colortext/printing.py rename to pym/calculate/lib/utils/colortext/printing.py diff --git a/calculate/lib/utils/common.py b/pym/calculate/lib/utils/common.py similarity index 100% rename from calculate/lib/utils/common.py rename to pym/calculate/lib/utils/common.py diff --git a/calculate/lib/utils/content.py b/pym/calculate/lib/utils/content.py similarity index 100% rename from calculate/lib/utils/content.py rename to pym/calculate/lib/utils/content.py diff --git a/calculate/lib/utils/device.py b/pym/calculate/lib/utils/device.py similarity index 100% rename from calculate/lib/utils/device.py rename to pym/calculate/lib/utils/device.py diff --git a/calculate/lib/utils/files.py b/pym/calculate/lib/utils/files.py similarity index 100% rename from calculate/lib/utils/files.py rename to pym/calculate/lib/utils/files.py diff --git a/calculate/lib/utils/ip.py b/pym/calculate/lib/utils/ip.py similarity index 100% rename from calculate/lib/utils/ip.py rename to pym/calculate/lib/utils/ip.py diff --git a/calculate/lib/utils/portage.py b/pym/calculate/lib/utils/portage.py similarity index 100% rename from calculate/lib/utils/portage.py rename to pym/calculate/lib/utils/portage.py diff --git a/calculate/lib/utils/text.py b/pym/calculate/lib/utils/text.py similarity index 100% rename from calculate/lib/utils/text.py rename to pym/calculate/lib/utils/text.py diff --git a/calculate/lib/utils/tools.py b/pym/calculate/lib/utils/tools.py similarity index 100% rename from calculate/lib/utils/tools.py rename to pym/calculate/lib/utils/tools.py diff --git a/calculate/lib/variables/X11.py b/pym/calculate/lib/variables/X11.py similarity index 100% rename from calculate/lib/variables/X11.py rename to pym/calculate/lib/variables/X11.py diff --git a/calculate/lib/variables/__init__.py b/pym/calculate/lib/variables/__init__.py similarity index 100% rename from calculate/lib/variables/__init__.py rename to pym/calculate/lib/variables/__init__.py diff --git a/calculate/lib/variables/action.py b/pym/calculate/lib/variables/action.py similarity index 100% rename from calculate/lib/variables/action.py rename to pym/calculate/lib/variables/action.py diff --git a/calculate/lib/variables/env.py b/pym/calculate/lib/variables/env.py similarity index 100% rename from calculate/lib/variables/env.py rename to pym/calculate/lib/variables/env.py diff --git a/calculate/lib/variables/hardware.py b/pym/calculate/lib/variables/hardware.py similarity index 100% rename from calculate/lib/variables/hardware.py rename to pym/calculate/lib/variables/hardware.py diff --git a/calculate/lib/variables/linux.py b/pym/calculate/lib/variables/linux.py similarity index 100% rename from calculate/lib/variables/linux.py rename to pym/calculate/lib/variables/linux.py diff --git a/calculate/lib/variables/locale.py b/pym/calculate/lib/variables/locale.py similarity index 100% rename from calculate/lib/variables/locale.py rename to pym/calculate/lib/variables/locale.py diff --git a/calculate/lib/variables/net.py b/pym/calculate/lib/variables/net.py similarity index 100% rename from calculate/lib/variables/net.py rename to pym/calculate/lib/variables/net.py diff --git a/calculate/lib/variables/system.py b/pym/calculate/lib/variables/system.py similarity index 100% rename from calculate/lib/variables/system.py rename to pym/calculate/lib/variables/system.py diff --git a/calculate/lib/variables/user.py b/pym/calculate/lib/variables/user.py similarity index 100% rename from calculate/lib/variables/user.py rename to pym/calculate/lib/variables/user.py diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 3c14dca..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[install] -install-scripts=/usr/sbin diff --git a/setup.py b/setup.py index 2466abf..27ed007 100755 --- a/setup.py +++ b/setup.py @@ -22,11 +22,22 @@ from distutils.core import setup from distutils.command.build_scripts import build_scripts from distutils.command.install_scripts import install_scripts -__version__ = "3.1.9" +__version__ = "3.2.2" __app__ = "calculate-lib" +try: + from portage.const import EPREFIX +except ImportError: + EPREFIX='' + module_name = "calculate.lib" +packages = [ + str('.'.join(root.split(os.sep)[1:])) + for root, dirs, files in os.walk('pym/calculate') + if '__init__.py' in files +] + setup( name = __app__, version = __version__, @@ -36,15 +47,8 @@ setup( url = "http://calculate-linux.org", license = "http://www.apache.org/licenses/LICENSE-2.0", scripts = [], - packages=['calculate', - module_name, - module_name + '.client', - module_name + '.format', - module_name + '.server', - module_name + '.variables', - module_name + '.mod', - module_name + '.utils', - module_name + '.utils.colortext'], + package_dir={'': 'pym'}, + packages=packages, data_files = [("/etc/calculate", []), ("/var/calculate/remote", []), ("/var/log/calculate", [])]