From 80ef13612b92e7acbf682748455530df29ab41a1 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 2 Apr 2018 19:44:50 +0200 Subject: [PATCH] core, setup: huge cleaning: - moved directories from src and frontends/src to sat and sat_frontends, which is the recommanded naming convention - move twisted directory to root - removed all hacks from setup.py, and added missing dependencies, it is now clean - use https URL for website in setup.py - removed "Environment :: X11 Applications :: GTK", as wix is deprecated and removed - renamed sat.sh to sat and fixed its installation - added python_requires to specify Python version needed - replaced glib2reactor which use deprecated code by gtk3reactor sat can now be installed directly from virtualenv without using --system-site-packages anymore \o/ --- MANIFEST.in | 2 +- src/sat.sh => bin/sat | 2 +- {src => sat}/__init__.py | 0 {frontends/src => sat/bridge}/__init__.py | 0 .../bridge/bridge_constructor}/__init__.py | 0 .../bridge_constructor/base_constructor.py | 0 .../bridge_constructor/bridge_constructor.py | 0 .../bridge_constructor/bridge_template.ini | 0 .../bridge/bridge_constructor/constants.py | 0 .../constructors}/__init__.py | 0 .../constructors/dbus-xml}/__init__.py | 0 .../constructors/dbus-xml/constructor.py | 0 .../dbus-xml/dbus_xml_template.xml | 0 .../constructors/dbus}/__init__.py | 0 .../constructors/dbus/constructor.py | 0 .../constructors/dbus/dbus_core_template.py | 0 .../dbus/dbus_frontend_template.py | 0 .../constructors/embedded}/__init__.py | 0 .../constructors/embedded/constructor.py | 0 .../embedded/embedded_frontend_template.py | 0 .../embedded/embedded_template.py | 0 .../constructors/mediawiki}/__init__.py | 0 .../constructors/mediawiki/constructor.py | 0 .../mediawiki/mediawiki_template.tpl | 0 .../constructors/pb}/__init__.py | 0 .../constructors/pb/constructor.py | 0 .../constructors/pb/pb_core_template.py | 0 .../constructors/pb/pb_frontend_template.py | 0 {src => sat}/bridge/dbus_bridge.py | 0 .../constructors => sat/core}/__init__.py | 0 {src => sat}/core/constants.py | 0 {src => sat}/core/exceptions.py | 0 {src => sat}/core/i18n.py | 0 {src => sat}/core/log.py | 0 {src => sat}/core/log_config.py | 0 {src => sat}/core/sat_main.py | 0 {src => sat}/core/xmpp.py | 0 .../dbus-xml => sat/memory}/__init__.py | 0 {src => sat}/memory/cache.py | 0 {src => sat}/memory/crypto.py | 0 {src => sat}/memory/disco.py | 0 {src => sat}/memory/memory.py | 0 {src => sat}/memory/params.py | 0 {src => sat}/memory/persistent.py | 0 {src => sat}/memory/sqlite.py | 0 {src => sat}/plugins/__init__.py | 0 {src => sat}/plugins/plugin_adhoc_dbus.py | 0 {src => sat}/plugins/plugin_blog_import.py | 0 .../plugins/plugin_blog_import_dokuwiki.py | 0 .../plugins/plugin_blog_import_dotclear.py | 0 .../plugins/plugin_comp_file_sharing.py | 0 .../plugins/plugin_exp_command_export.py | 0 {src => sat}/plugins/plugin_exp_events.py | 0 .../plugins/plugin_exp_jingle_stream.py | 0 .../plugins/plugin_exp_lang_detect.py | 0 {src => sat}/plugins/plugin_exp_parrot.py | 0 .../plugins/plugin_exp_pubsub_hook.py | 0 .../plugins/plugin_exp_pubsub_schema.py | 0 {src => sat}/plugins/plugin_import.py | 0 .../plugins/plugin_merge_req_mercurial.py | 0 {src => sat}/plugins/plugin_misc_account.py | 0 {src => sat}/plugins/plugin_misc_android.py | 0 {src => sat}/plugins/plugin_misc_debug.py | 0 {src => sat}/plugins/plugin_misc_extra_pep.py | 0 {src => sat}/plugins/plugin_misc_file.py | 0 {src => sat}/plugins/plugin_misc_forums.py | 0 {src => sat}/plugins/plugin_misc_groupblog.py | 0 {src => sat}/plugins/plugin_misc_identity.py | 0 {src => sat}/plugins/plugin_misc_imap.py | 0 .../plugins/plugin_misc_invitations.py | 0 {src => sat}/plugins/plugin_misc_ip.py | 0 {src => sat}/plugins/plugin_misc_maildir.py | 0 .../plugins/plugin_misc_merge_requests.py | 0 {src => sat}/plugins/plugin_misc_nat-port.py | 0 {src => sat}/plugins/plugin_misc_quiz.py | 0 {src => sat}/plugins/plugin_misc_radiocol.py | 0 .../plugins/plugin_misc_register_account.py | 0 {src => sat}/plugins/plugin_misc_room_game.py | 0 {src => sat}/plugins/plugin_misc_smtp.py | 0 .../plugins/plugin_misc_static_blog.py | 0 {src => sat}/plugins/plugin_misc_tarot.py | 0 .../plugins/plugin_misc_text_commands.py | 0 .../plugins/plugin_misc_text_syntaxes.py | 0 {src => sat}/plugins/plugin_misc_tickets.py | 0 {src => sat}/plugins/plugin_misc_upload.py | 0 .../plugins/plugin_misc_uri_finder.py | 0 {src => sat}/plugins/plugin_misc_watched.py | 0 {src => sat}/plugins/plugin_misc_welcome.py | 0 {src => sat}/plugins/plugin_misc_xmllog.py | 0 {src => sat}/plugins/plugin_sec_otr.py | 0 .../plugins/plugin_syntax_wiki_dotclear.py | 0 {src => sat}/plugins/plugin_tickets_import.py | 0 .../plugins/plugin_tickets_import_bugzilla.py | 0 .../plugin_tmp_directory_subscription.py | 0 {src => sat}/plugins/plugin_xep_0020.py | 0 {src => sat}/plugins/plugin_xep_0033.py | 0 {src => sat}/plugins/plugin_xep_0045.py | 0 {src => sat}/plugins/plugin_xep_0047.py | 0 {src => sat}/plugins/plugin_xep_0048.py | 0 {src => sat}/plugins/plugin_xep_0049.py | 0 {src => sat}/plugins/plugin_xep_0050.py | 0 {src => sat}/plugins/plugin_xep_0054.py | 0 {src => sat}/plugins/plugin_xep_0055.py | 0 {src => sat}/plugins/plugin_xep_0059.py | 0 {src => sat}/plugins/plugin_xep_0060.py | 0 {src => sat}/plugins/plugin_xep_0065.py | 0 {src => sat}/plugins/plugin_xep_0070.py | 0 {src => sat}/plugins/plugin_xep_0071.py | 0 {src => sat}/plugins/plugin_xep_0077.py | 0 {src => sat}/plugins/plugin_xep_0085.py | 0 {src => sat}/plugins/plugin_xep_0092.py | 0 {src => sat}/plugins/plugin_xep_0095.py | 0 {src => sat}/plugins/plugin_xep_0096.py | 0 {src => sat}/plugins/plugin_xep_0100.py | 0 {src => sat}/plugins/plugin_xep_0115.py | 0 {src => sat}/plugins/plugin_xep_0163.py | 0 {src => sat}/plugins/plugin_xep_0166.py | 0 {src => sat}/plugins/plugin_xep_0184.py | 0 {src => sat}/plugins/plugin_xep_0203.py | 0 {src => sat}/plugins/plugin_xep_0231.py | 0 {src => sat}/plugins/plugin_xep_0234.py | 0 {src => sat}/plugins/plugin_xep_0249.py | 0 {src => sat}/plugins/plugin_xep_0260.py | 0 {src => sat}/plugins/plugin_xep_0261.py | 0 {src => sat}/plugins/plugin_xep_0264.py | 0 {src => sat}/plugins/plugin_xep_0277.py | 0 {src => sat}/plugins/plugin_xep_0280.py | 0 {src => sat}/plugins/plugin_xep_0297.py | 0 {src => sat}/plugins/plugin_xep_0300.py | 0 {src => sat}/plugins/plugin_xep_0313.py | 0 {src => sat}/plugins/plugin_xep_0329.py | 0 {src => sat}/plugins/plugin_xep_0334.py | 0 {src => sat}/plugins/plugin_xep_0363.py | 0 .../dbus => sat/stdui}/__init__.py | 0 {src => sat}/stdui/ui_contact_list.py | 0 {src => sat}/stdui/ui_profile_manager.py | 0 .../embedded => sat/test}/__init__.py | 0 {src => sat}/test/constants.py | 0 {src => sat}/test/helpers.py | 0 {src => sat}/test/helpers_plugins.py | 0 {src => sat}/test/test_core_xmpp.py | 0 {src => sat}/test/test_helpers_plugins.py | 0 {src => sat}/test/test_memory.py | 0 {src => sat}/test/test_memory_crypto.py | 0 .../test/test_plugin_misc_groupblog.py | 0 .../test/test_plugin_misc_radiocol.py | 0 .../test/test_plugin_misc_room_game.py | 0 .../test/test_plugin_misc_text_syntaxes.py | 0 {src => sat}/test/test_plugin_xep_0033.py | 0 {src => sat}/test/test_plugin_xep_0085.py | 0 {src => sat}/test/test_plugin_xep_0203.py | 0 {src => sat}/test/test_plugin_xep_0277.py | 0 {src => sat}/test/test_plugin_xep_0297.py | 0 {src => sat}/test/test_plugin_xep_0313.py | 0 {src => sat}/test/test_plugin_xep_0334.py | 0 .../mediawiki => sat/tools}/__init__.py | 0 .../pb => sat/tools/common}/__init__.py | 0 {src => sat}/tools/common/ansi.py | 0 {src => sat}/tools/common/data_format.py | 0 {src => sat}/tools/common/data_objects.py | 0 {src => sat}/tools/common/dynamic_import.py | 0 {src => sat}/tools/common/regex.py | 0 {src => sat}/tools/common/template.py | 0 {src => sat}/tools/common/template_xmlui.py | 0 {src => sat}/tools/common/uri.py | 0 {src => sat}/tools/config.py | 0 {src => sat}/tools/email.py | 0 {src => sat}/tools/sat_defer.py | 0 {src => sat}/tools/stream.py | 0 {src => sat}/tools/trigger.py | 0 {src => sat}/tools/utils.py | 0 {src => sat}/tools/xml_tools.py | 0 {src/core => sat_frontends}/__init__.py | 0 .../bridge}/__init__.py | 0 .../bridge/bridge_frontend.py | 0 .../bridge/dbus_bridge.py | 0 {src/stdui => sat_frontends/jp}/__init__.py | 0 .../src => sat_frontends}/jp/arg_tools.py | 0 {frontends/src => sat_frontends}/jp/base.py | 0 .../src => sat_frontends}/jp/cmd_account.py | 0 .../src => sat_frontends}/jp/cmd_adhoc.py | 0 .../src => sat_frontends}/jp/cmd_avatar.py | 0 .../src => sat_frontends}/jp/cmd_blog.py | 0 .../src => sat_frontends}/jp/cmd_bookmarks.py | 0 .../src => sat_frontends}/jp/cmd_debug.py | 0 .../src => sat_frontends}/jp/cmd_event.py | 0 .../src => sat_frontends}/jp/cmd_file.py | 0 .../src => sat_frontends}/jp/cmd_forums.py | 0 .../src => sat_frontends}/jp/cmd_identity.py | 0 .../src => sat_frontends}/jp/cmd_info.py | 0 .../src => sat_frontends}/jp/cmd_input.py | 0 .../jp/cmd_invitation.py | 0 .../jp/cmd_merge_request.py | 0 .../src => sat_frontends}/jp/cmd_message.py | 0 .../src => sat_frontends}/jp/cmd_param.py | 0 .../src => sat_frontends}/jp/cmd_pipe.py | 0 .../src => sat_frontends}/jp/cmd_profile.py | 0 .../src => sat_frontends}/jp/cmd_pubsub.py | 0 .../src => sat_frontends}/jp/cmd_roster.py | 0 .../src => sat_frontends}/jp/cmd_shell.py | 0 .../src => sat_frontends}/jp/cmd_ticket.py | 0 .../src => sat_frontends}/jp/cmd_uri.py | 0 {frontends/src => sat_frontends}/jp/common.py | 0 .../src => sat_frontends}/jp/constants.py | 0 {frontends/src => sat_frontends}/jp/jp | 0 .../src => sat_frontends}/jp/output_std.py | 0 .../jp/output_template.py | 0 .../src => sat_frontends}/jp/output_xml.py | 0 .../src => sat_frontends}/jp/xmlui_manager.py | 0 .../primitivus}/__init__.py | 0 .../src => sat_frontends}/primitivus/chat.py | 0 .../primitivus/config.py | 0 .../primitivus/constants.py | 0 .../primitivus/contact_list.py | 0 .../primitivus/game_tarot.py | 0 .../src => sat_frontends}/primitivus/keys.py | 0 .../primitivus/notify.py | 0 .../primitivus/primitivus | 0 .../primitivus/profile_manager.py | 0 .../primitivus/progress.py | 0 .../primitivus/status.py | 0 .../primitivus/widget.py | 0 .../src => sat_frontends}/primitivus/xmlui.py | 0 .../quick_frontend}/__init__.py | 0 .../quick_frontend/constants.py | 0 .../quick_frontend/quick_app.py | 0 .../quick_frontend/quick_blog.py | 0 .../quick_frontend/quick_chat.py | 0 .../quick_frontend/quick_contact_list.py | 0 .../quick_contact_management.py | 0 .../quick_frontend/quick_game_tarot.py | 0 .../quick_frontend/quick_games.py | 0 .../quick_frontend/quick_list_manager.py | 0 .../quick_frontend/quick_menus.py | 0 .../quick_frontend/quick_profile_manager.py | 0 .../quick_frontend/quick_utils.py | 0 .../quick_frontend/quick_widgets.py | 0 .../tools}/__init__.py | 0 .../tools/composition.py | 0 .../src => sat_frontends}/tools/css_color.py | 0 .../src => sat_frontends}/tools/games.py | 0 .../tools/host_listener.py | 0 {frontends/src => sat_frontends}/tools/jid.py | 0 .../src => sat_frontends}/tools/misc.py | 0 .../src => sat_frontends}/tools/strings.py | 0 .../src => sat_frontends}/tools/xmltools.py | 0 .../src => sat_frontends}/tools/xmlui.py | 0 setup.py | 305 +++--------------- .../twisted => twisted}/plugins/sat_plugin.py | 4 +- 249 files changed, 43 insertions(+), 270 deletions(-) rename src/sat.sh => bin/sat (97%) rename {src => sat}/__init__.py (100%) rename {frontends/src => sat/bridge}/__init__.py (100%) rename {frontends/src/bridge => sat/bridge/bridge_constructor}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/base_constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/bridge_constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/bridge_template.ini (100%) rename {src => sat}/bridge/bridge_constructor/constants.py (100%) rename {frontends/src/jp => sat/bridge/bridge_constructor/constructors}/__init__.py (100%) rename {frontends/src/primitivus => sat/bridge/bridge_constructor/constructors/dbus-xml}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/dbus-xml/constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml (100%) rename {frontends/src/quick_frontend => sat/bridge/bridge_constructor/constructors/dbus}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/dbus/constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py (100%) rename {frontends/src/tools => sat/bridge/bridge_constructor/constructors/embedded}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/embedded/constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/embedded/embedded_template.py (100%) rename {src/bridge => sat/bridge/bridge_constructor/constructors/mediawiki}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/mediawiki/constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl (100%) rename {src/bridge/bridge_constructor => sat/bridge/bridge_constructor/constructors/pb}/__init__.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/pb/constructor.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/pb/pb_core_template.py (100%) rename {src => sat}/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py (100%) rename {src => sat}/bridge/dbus_bridge.py (100%) mode change 100755 => 100644 rename {src/bridge/bridge_constructor/constructors => sat/core}/__init__.py (100%) rename {src => sat}/core/constants.py (100%) rename {src => sat}/core/exceptions.py (100%) rename {src => sat}/core/i18n.py (100%) rename {src => sat}/core/log.py (100%) rename {src => sat}/core/log_config.py (100%) rename {src => sat}/core/sat_main.py (100%) rename {src => sat}/core/xmpp.py (100%) rename {src/bridge/bridge_constructor/constructors/dbus-xml => sat/memory}/__init__.py (100%) rename {src => sat}/memory/cache.py (100%) rename {src => sat}/memory/crypto.py (100%) rename {src => sat}/memory/disco.py (100%) rename {src => sat}/memory/memory.py (100%) rename {src => sat}/memory/params.py (100%) rename {src => sat}/memory/persistent.py (100%) rename {src => sat}/memory/sqlite.py (100%) rename {src => sat}/plugins/__init__.py (100%) rename {src => sat}/plugins/plugin_adhoc_dbus.py (100%) rename {src => sat}/plugins/plugin_blog_import.py (100%) rename {src => sat}/plugins/plugin_blog_import_dokuwiki.py (100%) rename {src => sat}/plugins/plugin_blog_import_dotclear.py (100%) rename {src => sat}/plugins/plugin_comp_file_sharing.py (100%) rename {src => sat}/plugins/plugin_exp_command_export.py (100%) rename {src => sat}/plugins/plugin_exp_events.py (100%) rename {src => sat}/plugins/plugin_exp_jingle_stream.py (100%) rename {src => sat}/plugins/plugin_exp_lang_detect.py (100%) rename {src => sat}/plugins/plugin_exp_parrot.py (100%) rename {src => sat}/plugins/plugin_exp_pubsub_hook.py (100%) rename {src => sat}/plugins/plugin_exp_pubsub_schema.py (100%) rename {src => sat}/plugins/plugin_import.py (100%) rename {src => sat}/plugins/plugin_merge_req_mercurial.py (100%) rename {src => sat}/plugins/plugin_misc_account.py (100%) rename {src => sat}/plugins/plugin_misc_android.py (100%) rename {src => sat}/plugins/plugin_misc_debug.py (100%) rename {src => sat}/plugins/plugin_misc_extra_pep.py (100%) rename {src => sat}/plugins/plugin_misc_file.py (100%) rename {src => sat}/plugins/plugin_misc_forums.py (100%) rename {src => sat}/plugins/plugin_misc_groupblog.py (100%) rename {src => sat}/plugins/plugin_misc_identity.py (100%) rename {src => sat}/plugins/plugin_misc_imap.py (100%) rename {src => sat}/plugins/plugin_misc_invitations.py (100%) rename {src => sat}/plugins/plugin_misc_ip.py (100%) rename {src => sat}/plugins/plugin_misc_maildir.py (100%) rename {src => sat}/plugins/plugin_misc_merge_requests.py (100%) rename {src => sat}/plugins/plugin_misc_nat-port.py (100%) rename {src => sat}/plugins/plugin_misc_quiz.py (100%) rename {src => sat}/plugins/plugin_misc_radiocol.py (100%) rename {src => sat}/plugins/plugin_misc_register_account.py (100%) rename {src => sat}/plugins/plugin_misc_room_game.py (100%) rename {src => sat}/plugins/plugin_misc_smtp.py (100%) rename {src => sat}/plugins/plugin_misc_static_blog.py (100%) rename {src => sat}/plugins/plugin_misc_tarot.py (100%) rename {src => sat}/plugins/plugin_misc_text_commands.py (100%) rename {src => sat}/plugins/plugin_misc_text_syntaxes.py (100%) rename {src => sat}/plugins/plugin_misc_tickets.py (100%) rename {src => sat}/plugins/plugin_misc_upload.py (100%) rename {src => sat}/plugins/plugin_misc_uri_finder.py (100%) rename {src => sat}/plugins/plugin_misc_watched.py (100%) rename {src => sat}/plugins/plugin_misc_welcome.py (100%) rename {src => sat}/plugins/plugin_misc_xmllog.py (100%) rename {src => sat}/plugins/plugin_sec_otr.py (100%) rename {src => sat}/plugins/plugin_syntax_wiki_dotclear.py (100%) rename {src => sat}/plugins/plugin_tickets_import.py (100%) rename {src => sat}/plugins/plugin_tickets_import_bugzilla.py (100%) rename {src => sat}/plugins/plugin_tmp_directory_subscription.py (100%) rename {src => sat}/plugins/plugin_xep_0020.py (100%) rename {src => sat}/plugins/plugin_xep_0033.py (100%) rename {src => sat}/plugins/plugin_xep_0045.py (100%) rename {src => sat}/plugins/plugin_xep_0047.py (100%) rename {src => sat}/plugins/plugin_xep_0048.py (100%) rename {src => sat}/plugins/plugin_xep_0049.py (100%) rename {src => sat}/plugins/plugin_xep_0050.py (100%) rename {src => sat}/plugins/plugin_xep_0054.py (100%) rename {src => sat}/plugins/plugin_xep_0055.py (100%) rename {src => sat}/plugins/plugin_xep_0059.py (100%) rename {src => sat}/plugins/plugin_xep_0060.py (100%) rename {src => sat}/plugins/plugin_xep_0065.py (100%) rename {src => sat}/plugins/plugin_xep_0070.py (100%) rename {src => sat}/plugins/plugin_xep_0071.py (100%) rename {src => sat}/plugins/plugin_xep_0077.py (100%) rename {src => sat}/plugins/plugin_xep_0085.py (100%) rename {src => sat}/plugins/plugin_xep_0092.py (100%) rename {src => sat}/plugins/plugin_xep_0095.py (100%) rename {src => sat}/plugins/plugin_xep_0096.py (100%) rename {src => sat}/plugins/plugin_xep_0100.py (100%) rename {src => sat}/plugins/plugin_xep_0115.py (100%) rename {src => sat}/plugins/plugin_xep_0163.py (100%) rename {src => sat}/plugins/plugin_xep_0166.py (100%) rename {src => sat}/plugins/plugin_xep_0184.py (100%) rename {src => sat}/plugins/plugin_xep_0203.py (100%) rename {src => sat}/plugins/plugin_xep_0231.py (100%) rename {src => sat}/plugins/plugin_xep_0234.py (100%) rename {src => sat}/plugins/plugin_xep_0249.py (100%) rename {src => sat}/plugins/plugin_xep_0260.py (100%) rename {src => sat}/plugins/plugin_xep_0261.py (100%) rename {src => sat}/plugins/plugin_xep_0264.py (100%) rename {src => sat}/plugins/plugin_xep_0277.py (100%) rename {src => sat}/plugins/plugin_xep_0280.py (100%) rename {src => sat}/plugins/plugin_xep_0297.py (100%) rename {src => sat}/plugins/plugin_xep_0300.py (100%) rename {src => sat}/plugins/plugin_xep_0313.py (100%) rename {src => sat}/plugins/plugin_xep_0329.py (100%) rename {src => sat}/plugins/plugin_xep_0334.py (100%) rename {src => sat}/plugins/plugin_xep_0363.py (100%) rename {src/bridge/bridge_constructor/constructors/dbus => sat/stdui}/__init__.py (100%) rename {src => sat}/stdui/ui_contact_list.py (100%) rename {src => sat}/stdui/ui_profile_manager.py (100%) rename {src/bridge/bridge_constructor/constructors/embedded => sat/test}/__init__.py (100%) rename {src => sat}/test/constants.py (100%) rename {src => sat}/test/helpers.py (100%) rename {src => sat}/test/helpers_plugins.py (100%) rename {src => sat}/test/test_core_xmpp.py (100%) rename {src => sat}/test/test_helpers_plugins.py (100%) rename {src => sat}/test/test_memory.py (100%) rename {src => sat}/test/test_memory_crypto.py (100%) rename {src => sat}/test/test_plugin_misc_groupblog.py (100%) rename {src => sat}/test/test_plugin_misc_radiocol.py (100%) rename {src => sat}/test/test_plugin_misc_room_game.py (100%) rename {src => sat}/test/test_plugin_misc_text_syntaxes.py (100%) rename {src => sat}/test/test_plugin_xep_0033.py (100%) rename {src => sat}/test/test_plugin_xep_0085.py (100%) rename {src => sat}/test/test_plugin_xep_0203.py (100%) rename {src => sat}/test/test_plugin_xep_0277.py (100%) rename {src => sat}/test/test_plugin_xep_0297.py (100%) rename {src => sat}/test/test_plugin_xep_0313.py (100%) rename {src => sat}/test/test_plugin_xep_0334.py (100%) rename {src/bridge/bridge_constructor/constructors/mediawiki => sat/tools}/__init__.py (100%) rename {src/bridge/bridge_constructor/constructors/pb => sat/tools/common}/__init__.py (100%) rename {src => sat}/tools/common/ansi.py (100%) rename {src => sat}/tools/common/data_format.py (100%) rename {src => sat}/tools/common/data_objects.py (100%) rename {src => sat}/tools/common/dynamic_import.py (100%) rename {src => sat}/tools/common/regex.py (100%) rename {src => sat}/tools/common/template.py (100%) rename {src => sat}/tools/common/template_xmlui.py (100%) rename {src => sat}/tools/common/uri.py (100%) rename {src => sat}/tools/config.py (100%) rename {src => sat}/tools/email.py (100%) rename {src => sat}/tools/sat_defer.py (100%) rename {src => sat}/tools/stream.py (100%) rename {src => sat}/tools/trigger.py (100%) rename {src => sat}/tools/utils.py (100%) rename {src => sat}/tools/xml_tools.py (100%) rename {src/core => sat_frontends}/__init__.py (100%) rename {src/memory => sat_frontends/bridge}/__init__.py (100%) rename {frontends/src => sat_frontends}/bridge/bridge_frontend.py (100%) rename {frontends/src => sat_frontends}/bridge/dbus_bridge.py (100%) rename {src/stdui => sat_frontends/jp}/__init__.py (100%) rename {frontends/src => sat_frontends}/jp/arg_tools.py (100%) rename {frontends/src => sat_frontends}/jp/base.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_account.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_adhoc.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_avatar.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_blog.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_bookmarks.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_debug.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_event.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_file.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_forums.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_identity.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_info.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_input.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_invitation.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_merge_request.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_message.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_param.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_pipe.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_profile.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_pubsub.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_roster.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_shell.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_ticket.py (100%) rename {frontends/src => sat_frontends}/jp/cmd_uri.py (100%) rename {frontends/src => sat_frontends}/jp/common.py (100%) rename {frontends/src => sat_frontends}/jp/constants.py (100%) rename {frontends/src => sat_frontends}/jp/jp (100%) rename {frontends/src => sat_frontends}/jp/output_std.py (100%) rename {frontends/src => sat_frontends}/jp/output_template.py (100%) rename {frontends/src => sat_frontends}/jp/output_xml.py (100%) rename {frontends/src => sat_frontends}/jp/xmlui_manager.py (100%) rename {src/test => sat_frontends/primitivus}/__init__.py (100%) rename {frontends/src => sat_frontends}/primitivus/chat.py (100%) rename {frontends/src => sat_frontends}/primitivus/config.py (100%) rename {frontends/src => sat_frontends}/primitivus/constants.py (100%) rename {frontends/src => sat_frontends}/primitivus/contact_list.py (100%) rename {frontends/src => sat_frontends}/primitivus/game_tarot.py (100%) rename {frontends/src => sat_frontends}/primitivus/keys.py (100%) rename {frontends/src => sat_frontends}/primitivus/notify.py (100%) rename {frontends/src => sat_frontends}/primitivus/primitivus (100%) rename {frontends/src => sat_frontends}/primitivus/profile_manager.py (100%) rename {frontends/src => sat_frontends}/primitivus/progress.py (100%) rename {frontends/src => sat_frontends}/primitivus/status.py (100%) rename {frontends/src => sat_frontends}/primitivus/widget.py (100%) rename {frontends/src => sat_frontends}/primitivus/xmlui.py (100%) rename {src/tools => sat_frontends/quick_frontend}/__init__.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/constants.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_app.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_blog.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_chat.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_contact_list.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_contact_management.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_game_tarot.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_games.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_list_manager.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_menus.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_profile_manager.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_utils.py (100%) rename {frontends/src => sat_frontends}/quick_frontend/quick_widgets.py (100%) rename {src/tools/common => sat_frontends/tools}/__init__.py (100%) rename {frontends/src => sat_frontends}/tools/composition.py (100%) rename {frontends/src => sat_frontends}/tools/css_color.py (100%) rename {frontends/src => sat_frontends}/tools/games.py (100%) rename {frontends/src => sat_frontends}/tools/host_listener.py (100%) rename {frontends/src => sat_frontends}/tools/jid.py (100%) rename {frontends/src => sat_frontends}/tools/misc.py (100%) rename {frontends/src => sat_frontends}/tools/strings.py (100%) rename {frontends/src => sat_frontends}/tools/xmltools.py (100%) rename {frontends/src => sat_frontends}/tools/xmlui.py (100%) rename {src/twisted => twisted}/plugins/sat_plugin.py (96%) diff --git a/MANIFEST.in b/MANIFEST.in index 9620f6f5..6c42fbdb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,6 @@ global-include *.sh include src/sat.* include misc include frontends/src/jp/jp frontends/src/primitivus/primitivus -include src/bridge/bridge_constructor/mediawiki_template.tpl +include src/bridge/bridge_constructor global-exclude *.un~ prune src/bridge/bridge_constructor/generated diff --git a/src/sat.sh b/bin/sat similarity index 97% rename from src/sat.sh rename to bin/sat index bb3879ca..4cc508c7 100755 --- a/src/sat.sh +++ b/bin/sat @@ -61,7 +61,7 @@ LOG_FILE="$LOG_DIR$APP_NAME_FILE.log" RUNNING_MSG="$APP_NAME is running" NOT_RUNNING_MSG="$APP_NAME is *NOT* running" -# if there is one argument which is "stop", then we kill SàT +# if there is one argument which is "stop", then we kill SaT if [ $# -eq 1 ];then if [ $1 = "stop" ];then kill_process $PID_FILE "$APP_NAME" diff --git a/src/__init__.py b/sat/__init__.py similarity index 100% rename from src/__init__.py rename to sat/__init__.py diff --git a/frontends/src/__init__.py b/sat/bridge/__init__.py similarity index 100% rename from frontends/src/__init__.py rename to sat/bridge/__init__.py diff --git a/frontends/src/bridge/__init__.py b/sat/bridge/bridge_constructor/__init__.py similarity index 100% rename from frontends/src/bridge/__init__.py rename to sat/bridge/bridge_constructor/__init__.py diff --git a/src/bridge/bridge_constructor/base_constructor.py b/sat/bridge/bridge_constructor/base_constructor.py similarity index 100% rename from src/bridge/bridge_constructor/base_constructor.py rename to sat/bridge/bridge_constructor/base_constructor.py diff --git a/src/bridge/bridge_constructor/bridge_constructor.py b/sat/bridge/bridge_constructor/bridge_constructor.py similarity index 100% rename from src/bridge/bridge_constructor/bridge_constructor.py rename to sat/bridge/bridge_constructor/bridge_constructor.py diff --git a/src/bridge/bridge_constructor/bridge_template.ini b/sat/bridge/bridge_constructor/bridge_template.ini similarity index 100% rename from src/bridge/bridge_constructor/bridge_template.ini rename to sat/bridge/bridge_constructor/bridge_template.ini diff --git a/src/bridge/bridge_constructor/constants.py b/sat/bridge/bridge_constructor/constants.py similarity index 100% rename from src/bridge/bridge_constructor/constants.py rename to sat/bridge/bridge_constructor/constants.py diff --git a/frontends/src/jp/__init__.py b/sat/bridge/bridge_constructor/constructors/__init__.py similarity index 100% rename from frontends/src/jp/__init__.py rename to sat/bridge/bridge_constructor/constructors/__init__.py diff --git a/frontends/src/primitivus/__init__.py b/sat/bridge/bridge_constructor/constructors/dbus-xml/__init__.py similarity index 100% rename from frontends/src/primitivus/__init__.py rename to sat/bridge/bridge_constructor/constructors/dbus-xml/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/dbus-xml/constructor.py b/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus-xml/constructor.py rename to sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py diff --git a/src/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml b/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml rename to sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml diff --git a/frontends/src/quick_frontend/__init__.py b/sat/bridge/bridge_constructor/constructors/dbus/__init__.py similarity index 100% rename from frontends/src/quick_frontend/__init__.py rename to sat/bridge/bridge_constructor/constructors/dbus/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/dbus/constructor.py b/sat/bridge/bridge_constructor/constructors/dbus/constructor.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus/constructor.py rename to sat/bridge/bridge_constructor/constructors/dbus/constructor.py diff --git a/src/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py rename to sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py diff --git a/src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py rename to sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py diff --git a/frontends/src/tools/__init__.py b/sat/bridge/bridge_constructor/constructors/embedded/__init__.py similarity index 100% rename from frontends/src/tools/__init__.py rename to sat/bridge/bridge_constructor/constructors/embedded/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/embedded/constructor.py b/sat/bridge/bridge_constructor/constructors/embedded/constructor.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/embedded/constructor.py rename to sat/bridge/bridge_constructor/constructors/embedded/constructor.py diff --git a/src/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py b/sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py rename to sat/bridge/bridge_constructor/constructors/embedded/embedded_frontend_template.py diff --git a/src/bridge/bridge_constructor/constructors/embedded/embedded_template.py b/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/embedded/embedded_template.py rename to sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py diff --git a/src/bridge/__init__.py b/sat/bridge/bridge_constructor/constructors/mediawiki/__init__.py similarity index 100% rename from src/bridge/__init__.py rename to sat/bridge/bridge_constructor/constructors/mediawiki/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/mediawiki/constructor.py b/sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/mediawiki/constructor.py rename to sat/bridge/bridge_constructor/constructors/mediawiki/constructor.py diff --git a/src/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl b/sat/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl similarity index 100% rename from src/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl rename to sat/bridge/bridge_constructor/constructors/mediawiki/mediawiki_template.tpl diff --git a/src/bridge/bridge_constructor/__init__.py b/sat/bridge/bridge_constructor/constructors/pb/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/__init__.py rename to sat/bridge/bridge_constructor/constructors/pb/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/pb/constructor.py b/sat/bridge/bridge_constructor/constructors/pb/constructor.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/pb/constructor.py rename to sat/bridge/bridge_constructor/constructors/pb/constructor.py diff --git a/src/bridge/bridge_constructor/constructors/pb/pb_core_template.py b/sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/pb/pb_core_template.py rename to sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py diff --git a/src/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py b/sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py rename to sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py diff --git a/src/bridge/dbus_bridge.py b/sat/bridge/dbus_bridge.py old mode 100755 new mode 100644 similarity index 100% rename from src/bridge/dbus_bridge.py rename to sat/bridge/dbus_bridge.py diff --git a/src/bridge/bridge_constructor/constructors/__init__.py b/sat/core/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/__init__.py rename to sat/core/__init__.py diff --git a/src/core/constants.py b/sat/core/constants.py similarity index 100% rename from src/core/constants.py rename to sat/core/constants.py diff --git a/src/core/exceptions.py b/sat/core/exceptions.py similarity index 100% rename from src/core/exceptions.py rename to sat/core/exceptions.py diff --git a/src/core/i18n.py b/sat/core/i18n.py similarity index 100% rename from src/core/i18n.py rename to sat/core/i18n.py diff --git a/src/core/log.py b/sat/core/log.py similarity index 100% rename from src/core/log.py rename to sat/core/log.py diff --git a/src/core/log_config.py b/sat/core/log_config.py similarity index 100% rename from src/core/log_config.py rename to sat/core/log_config.py diff --git a/src/core/sat_main.py b/sat/core/sat_main.py similarity index 100% rename from src/core/sat_main.py rename to sat/core/sat_main.py diff --git a/src/core/xmpp.py b/sat/core/xmpp.py similarity index 100% rename from src/core/xmpp.py rename to sat/core/xmpp.py diff --git a/src/bridge/bridge_constructor/constructors/dbus-xml/__init__.py b/sat/memory/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus-xml/__init__.py rename to sat/memory/__init__.py diff --git a/src/memory/cache.py b/sat/memory/cache.py similarity index 100% rename from src/memory/cache.py rename to sat/memory/cache.py diff --git a/src/memory/crypto.py b/sat/memory/crypto.py similarity index 100% rename from src/memory/crypto.py rename to sat/memory/crypto.py diff --git a/src/memory/disco.py b/sat/memory/disco.py similarity index 100% rename from src/memory/disco.py rename to sat/memory/disco.py diff --git a/src/memory/memory.py b/sat/memory/memory.py similarity index 100% rename from src/memory/memory.py rename to sat/memory/memory.py diff --git a/src/memory/params.py b/sat/memory/params.py similarity index 100% rename from src/memory/params.py rename to sat/memory/params.py diff --git a/src/memory/persistent.py b/sat/memory/persistent.py similarity index 100% rename from src/memory/persistent.py rename to sat/memory/persistent.py diff --git a/src/memory/sqlite.py b/sat/memory/sqlite.py similarity index 100% rename from src/memory/sqlite.py rename to sat/memory/sqlite.py diff --git a/src/plugins/__init__.py b/sat/plugins/__init__.py similarity index 100% rename from src/plugins/__init__.py rename to sat/plugins/__init__.py diff --git a/src/plugins/plugin_adhoc_dbus.py b/sat/plugins/plugin_adhoc_dbus.py similarity index 100% rename from src/plugins/plugin_adhoc_dbus.py rename to sat/plugins/plugin_adhoc_dbus.py diff --git a/src/plugins/plugin_blog_import.py b/sat/plugins/plugin_blog_import.py similarity index 100% rename from src/plugins/plugin_blog_import.py rename to sat/plugins/plugin_blog_import.py diff --git a/src/plugins/plugin_blog_import_dokuwiki.py b/sat/plugins/plugin_blog_import_dokuwiki.py similarity index 100% rename from src/plugins/plugin_blog_import_dokuwiki.py rename to sat/plugins/plugin_blog_import_dokuwiki.py diff --git a/src/plugins/plugin_blog_import_dotclear.py b/sat/plugins/plugin_blog_import_dotclear.py similarity index 100% rename from src/plugins/plugin_blog_import_dotclear.py rename to sat/plugins/plugin_blog_import_dotclear.py diff --git a/src/plugins/plugin_comp_file_sharing.py b/sat/plugins/plugin_comp_file_sharing.py similarity index 100% rename from src/plugins/plugin_comp_file_sharing.py rename to sat/plugins/plugin_comp_file_sharing.py diff --git a/src/plugins/plugin_exp_command_export.py b/sat/plugins/plugin_exp_command_export.py similarity index 100% rename from src/plugins/plugin_exp_command_export.py rename to sat/plugins/plugin_exp_command_export.py diff --git a/src/plugins/plugin_exp_events.py b/sat/plugins/plugin_exp_events.py similarity index 100% rename from src/plugins/plugin_exp_events.py rename to sat/plugins/plugin_exp_events.py diff --git a/src/plugins/plugin_exp_jingle_stream.py b/sat/plugins/plugin_exp_jingle_stream.py similarity index 100% rename from src/plugins/plugin_exp_jingle_stream.py rename to sat/plugins/plugin_exp_jingle_stream.py diff --git a/src/plugins/plugin_exp_lang_detect.py b/sat/plugins/plugin_exp_lang_detect.py similarity index 100% rename from src/plugins/plugin_exp_lang_detect.py rename to sat/plugins/plugin_exp_lang_detect.py diff --git a/src/plugins/plugin_exp_parrot.py b/sat/plugins/plugin_exp_parrot.py similarity index 100% rename from src/plugins/plugin_exp_parrot.py rename to sat/plugins/plugin_exp_parrot.py diff --git a/src/plugins/plugin_exp_pubsub_hook.py b/sat/plugins/plugin_exp_pubsub_hook.py similarity index 100% rename from src/plugins/plugin_exp_pubsub_hook.py rename to sat/plugins/plugin_exp_pubsub_hook.py diff --git a/src/plugins/plugin_exp_pubsub_schema.py b/sat/plugins/plugin_exp_pubsub_schema.py similarity index 100% rename from src/plugins/plugin_exp_pubsub_schema.py rename to sat/plugins/plugin_exp_pubsub_schema.py diff --git a/src/plugins/plugin_import.py b/sat/plugins/plugin_import.py similarity index 100% rename from src/plugins/plugin_import.py rename to sat/plugins/plugin_import.py diff --git a/src/plugins/plugin_merge_req_mercurial.py b/sat/plugins/plugin_merge_req_mercurial.py similarity index 100% rename from src/plugins/plugin_merge_req_mercurial.py rename to sat/plugins/plugin_merge_req_mercurial.py diff --git a/src/plugins/plugin_misc_account.py b/sat/plugins/plugin_misc_account.py similarity index 100% rename from src/plugins/plugin_misc_account.py rename to sat/plugins/plugin_misc_account.py diff --git a/src/plugins/plugin_misc_android.py b/sat/plugins/plugin_misc_android.py similarity index 100% rename from src/plugins/plugin_misc_android.py rename to sat/plugins/plugin_misc_android.py diff --git a/src/plugins/plugin_misc_debug.py b/sat/plugins/plugin_misc_debug.py similarity index 100% rename from src/plugins/plugin_misc_debug.py rename to sat/plugins/plugin_misc_debug.py diff --git a/src/plugins/plugin_misc_extra_pep.py b/sat/plugins/plugin_misc_extra_pep.py similarity index 100% rename from src/plugins/plugin_misc_extra_pep.py rename to sat/plugins/plugin_misc_extra_pep.py diff --git a/src/plugins/plugin_misc_file.py b/sat/plugins/plugin_misc_file.py similarity index 100% rename from src/plugins/plugin_misc_file.py rename to sat/plugins/plugin_misc_file.py diff --git a/src/plugins/plugin_misc_forums.py b/sat/plugins/plugin_misc_forums.py similarity index 100% rename from src/plugins/plugin_misc_forums.py rename to sat/plugins/plugin_misc_forums.py diff --git a/src/plugins/plugin_misc_groupblog.py b/sat/plugins/plugin_misc_groupblog.py similarity index 100% rename from src/plugins/plugin_misc_groupblog.py rename to sat/plugins/plugin_misc_groupblog.py diff --git a/src/plugins/plugin_misc_identity.py b/sat/plugins/plugin_misc_identity.py similarity index 100% rename from src/plugins/plugin_misc_identity.py rename to sat/plugins/plugin_misc_identity.py diff --git a/src/plugins/plugin_misc_imap.py b/sat/plugins/plugin_misc_imap.py similarity index 100% rename from src/plugins/plugin_misc_imap.py rename to sat/plugins/plugin_misc_imap.py diff --git a/src/plugins/plugin_misc_invitations.py b/sat/plugins/plugin_misc_invitations.py similarity index 100% rename from src/plugins/plugin_misc_invitations.py rename to sat/plugins/plugin_misc_invitations.py diff --git a/src/plugins/plugin_misc_ip.py b/sat/plugins/plugin_misc_ip.py similarity index 100% rename from src/plugins/plugin_misc_ip.py rename to sat/plugins/plugin_misc_ip.py diff --git a/src/plugins/plugin_misc_maildir.py b/sat/plugins/plugin_misc_maildir.py similarity index 100% rename from src/plugins/plugin_misc_maildir.py rename to sat/plugins/plugin_misc_maildir.py diff --git a/src/plugins/plugin_misc_merge_requests.py b/sat/plugins/plugin_misc_merge_requests.py similarity index 100% rename from src/plugins/plugin_misc_merge_requests.py rename to sat/plugins/plugin_misc_merge_requests.py diff --git a/src/plugins/plugin_misc_nat-port.py b/sat/plugins/plugin_misc_nat-port.py similarity index 100% rename from src/plugins/plugin_misc_nat-port.py rename to sat/plugins/plugin_misc_nat-port.py diff --git a/src/plugins/plugin_misc_quiz.py b/sat/plugins/plugin_misc_quiz.py similarity index 100% rename from src/plugins/plugin_misc_quiz.py rename to sat/plugins/plugin_misc_quiz.py diff --git a/src/plugins/plugin_misc_radiocol.py b/sat/plugins/plugin_misc_radiocol.py similarity index 100% rename from src/plugins/plugin_misc_radiocol.py rename to sat/plugins/plugin_misc_radiocol.py diff --git a/src/plugins/plugin_misc_register_account.py b/sat/plugins/plugin_misc_register_account.py similarity index 100% rename from src/plugins/plugin_misc_register_account.py rename to sat/plugins/plugin_misc_register_account.py diff --git a/src/plugins/plugin_misc_room_game.py b/sat/plugins/plugin_misc_room_game.py similarity index 100% rename from src/plugins/plugin_misc_room_game.py rename to sat/plugins/plugin_misc_room_game.py diff --git a/src/plugins/plugin_misc_smtp.py b/sat/plugins/plugin_misc_smtp.py similarity index 100% rename from src/plugins/plugin_misc_smtp.py rename to sat/plugins/plugin_misc_smtp.py diff --git a/src/plugins/plugin_misc_static_blog.py b/sat/plugins/plugin_misc_static_blog.py similarity index 100% rename from src/plugins/plugin_misc_static_blog.py rename to sat/plugins/plugin_misc_static_blog.py diff --git a/src/plugins/plugin_misc_tarot.py b/sat/plugins/plugin_misc_tarot.py similarity index 100% rename from src/plugins/plugin_misc_tarot.py rename to sat/plugins/plugin_misc_tarot.py diff --git a/src/plugins/plugin_misc_text_commands.py b/sat/plugins/plugin_misc_text_commands.py similarity index 100% rename from src/plugins/plugin_misc_text_commands.py rename to sat/plugins/plugin_misc_text_commands.py diff --git a/src/plugins/plugin_misc_text_syntaxes.py b/sat/plugins/plugin_misc_text_syntaxes.py similarity index 100% rename from src/plugins/plugin_misc_text_syntaxes.py rename to sat/plugins/plugin_misc_text_syntaxes.py diff --git a/src/plugins/plugin_misc_tickets.py b/sat/plugins/plugin_misc_tickets.py similarity index 100% rename from src/plugins/plugin_misc_tickets.py rename to sat/plugins/plugin_misc_tickets.py diff --git a/src/plugins/plugin_misc_upload.py b/sat/plugins/plugin_misc_upload.py similarity index 100% rename from src/plugins/plugin_misc_upload.py rename to sat/plugins/plugin_misc_upload.py diff --git a/src/plugins/plugin_misc_uri_finder.py b/sat/plugins/plugin_misc_uri_finder.py similarity index 100% rename from src/plugins/plugin_misc_uri_finder.py rename to sat/plugins/plugin_misc_uri_finder.py diff --git a/src/plugins/plugin_misc_watched.py b/sat/plugins/plugin_misc_watched.py similarity index 100% rename from src/plugins/plugin_misc_watched.py rename to sat/plugins/plugin_misc_watched.py diff --git a/src/plugins/plugin_misc_welcome.py b/sat/plugins/plugin_misc_welcome.py similarity index 100% rename from src/plugins/plugin_misc_welcome.py rename to sat/plugins/plugin_misc_welcome.py diff --git a/src/plugins/plugin_misc_xmllog.py b/sat/plugins/plugin_misc_xmllog.py similarity index 100% rename from src/plugins/plugin_misc_xmllog.py rename to sat/plugins/plugin_misc_xmllog.py diff --git a/src/plugins/plugin_sec_otr.py b/sat/plugins/plugin_sec_otr.py similarity index 100% rename from src/plugins/plugin_sec_otr.py rename to sat/plugins/plugin_sec_otr.py diff --git a/src/plugins/plugin_syntax_wiki_dotclear.py b/sat/plugins/plugin_syntax_wiki_dotclear.py similarity index 100% rename from src/plugins/plugin_syntax_wiki_dotclear.py rename to sat/plugins/plugin_syntax_wiki_dotclear.py diff --git a/src/plugins/plugin_tickets_import.py b/sat/plugins/plugin_tickets_import.py similarity index 100% rename from src/plugins/plugin_tickets_import.py rename to sat/plugins/plugin_tickets_import.py diff --git a/src/plugins/plugin_tickets_import_bugzilla.py b/sat/plugins/plugin_tickets_import_bugzilla.py similarity index 100% rename from src/plugins/plugin_tickets_import_bugzilla.py rename to sat/plugins/plugin_tickets_import_bugzilla.py diff --git a/src/plugins/plugin_tmp_directory_subscription.py b/sat/plugins/plugin_tmp_directory_subscription.py similarity index 100% rename from src/plugins/plugin_tmp_directory_subscription.py rename to sat/plugins/plugin_tmp_directory_subscription.py diff --git a/src/plugins/plugin_xep_0020.py b/sat/plugins/plugin_xep_0020.py similarity index 100% rename from src/plugins/plugin_xep_0020.py rename to sat/plugins/plugin_xep_0020.py diff --git a/src/plugins/plugin_xep_0033.py b/sat/plugins/plugin_xep_0033.py similarity index 100% rename from src/plugins/plugin_xep_0033.py rename to sat/plugins/plugin_xep_0033.py diff --git a/src/plugins/plugin_xep_0045.py b/sat/plugins/plugin_xep_0045.py similarity index 100% rename from src/plugins/plugin_xep_0045.py rename to sat/plugins/plugin_xep_0045.py diff --git a/src/plugins/plugin_xep_0047.py b/sat/plugins/plugin_xep_0047.py similarity index 100% rename from src/plugins/plugin_xep_0047.py rename to sat/plugins/plugin_xep_0047.py diff --git a/src/plugins/plugin_xep_0048.py b/sat/plugins/plugin_xep_0048.py similarity index 100% rename from src/plugins/plugin_xep_0048.py rename to sat/plugins/plugin_xep_0048.py diff --git a/src/plugins/plugin_xep_0049.py b/sat/plugins/plugin_xep_0049.py similarity index 100% rename from src/plugins/plugin_xep_0049.py rename to sat/plugins/plugin_xep_0049.py diff --git a/src/plugins/plugin_xep_0050.py b/sat/plugins/plugin_xep_0050.py similarity index 100% rename from src/plugins/plugin_xep_0050.py rename to sat/plugins/plugin_xep_0050.py diff --git a/src/plugins/plugin_xep_0054.py b/sat/plugins/plugin_xep_0054.py similarity index 100% rename from src/plugins/plugin_xep_0054.py rename to sat/plugins/plugin_xep_0054.py diff --git a/src/plugins/plugin_xep_0055.py b/sat/plugins/plugin_xep_0055.py similarity index 100% rename from src/plugins/plugin_xep_0055.py rename to sat/plugins/plugin_xep_0055.py diff --git a/src/plugins/plugin_xep_0059.py b/sat/plugins/plugin_xep_0059.py similarity index 100% rename from src/plugins/plugin_xep_0059.py rename to sat/plugins/plugin_xep_0059.py diff --git a/src/plugins/plugin_xep_0060.py b/sat/plugins/plugin_xep_0060.py similarity index 100% rename from src/plugins/plugin_xep_0060.py rename to sat/plugins/plugin_xep_0060.py diff --git a/src/plugins/plugin_xep_0065.py b/sat/plugins/plugin_xep_0065.py similarity index 100% rename from src/plugins/plugin_xep_0065.py rename to sat/plugins/plugin_xep_0065.py diff --git a/src/plugins/plugin_xep_0070.py b/sat/plugins/plugin_xep_0070.py similarity index 100% rename from src/plugins/plugin_xep_0070.py rename to sat/plugins/plugin_xep_0070.py diff --git a/src/plugins/plugin_xep_0071.py b/sat/plugins/plugin_xep_0071.py similarity index 100% rename from src/plugins/plugin_xep_0071.py rename to sat/plugins/plugin_xep_0071.py diff --git a/src/plugins/plugin_xep_0077.py b/sat/plugins/plugin_xep_0077.py similarity index 100% rename from src/plugins/plugin_xep_0077.py rename to sat/plugins/plugin_xep_0077.py diff --git a/src/plugins/plugin_xep_0085.py b/sat/plugins/plugin_xep_0085.py similarity index 100% rename from src/plugins/plugin_xep_0085.py rename to sat/plugins/plugin_xep_0085.py diff --git a/src/plugins/plugin_xep_0092.py b/sat/plugins/plugin_xep_0092.py similarity index 100% rename from src/plugins/plugin_xep_0092.py rename to sat/plugins/plugin_xep_0092.py diff --git a/src/plugins/plugin_xep_0095.py b/sat/plugins/plugin_xep_0095.py similarity index 100% rename from src/plugins/plugin_xep_0095.py rename to sat/plugins/plugin_xep_0095.py diff --git a/src/plugins/plugin_xep_0096.py b/sat/plugins/plugin_xep_0096.py similarity index 100% rename from src/plugins/plugin_xep_0096.py rename to sat/plugins/plugin_xep_0096.py diff --git a/src/plugins/plugin_xep_0100.py b/sat/plugins/plugin_xep_0100.py similarity index 100% rename from src/plugins/plugin_xep_0100.py rename to sat/plugins/plugin_xep_0100.py diff --git a/src/plugins/plugin_xep_0115.py b/sat/plugins/plugin_xep_0115.py similarity index 100% rename from src/plugins/plugin_xep_0115.py rename to sat/plugins/plugin_xep_0115.py diff --git a/src/plugins/plugin_xep_0163.py b/sat/plugins/plugin_xep_0163.py similarity index 100% rename from src/plugins/plugin_xep_0163.py rename to sat/plugins/plugin_xep_0163.py diff --git a/src/plugins/plugin_xep_0166.py b/sat/plugins/plugin_xep_0166.py similarity index 100% rename from src/plugins/plugin_xep_0166.py rename to sat/plugins/plugin_xep_0166.py diff --git a/src/plugins/plugin_xep_0184.py b/sat/plugins/plugin_xep_0184.py similarity index 100% rename from src/plugins/plugin_xep_0184.py rename to sat/plugins/plugin_xep_0184.py diff --git a/src/plugins/plugin_xep_0203.py b/sat/plugins/plugin_xep_0203.py similarity index 100% rename from src/plugins/plugin_xep_0203.py rename to sat/plugins/plugin_xep_0203.py diff --git a/src/plugins/plugin_xep_0231.py b/sat/plugins/plugin_xep_0231.py similarity index 100% rename from src/plugins/plugin_xep_0231.py rename to sat/plugins/plugin_xep_0231.py diff --git a/src/plugins/plugin_xep_0234.py b/sat/plugins/plugin_xep_0234.py similarity index 100% rename from src/plugins/plugin_xep_0234.py rename to sat/plugins/plugin_xep_0234.py diff --git a/src/plugins/plugin_xep_0249.py b/sat/plugins/plugin_xep_0249.py similarity index 100% rename from src/plugins/plugin_xep_0249.py rename to sat/plugins/plugin_xep_0249.py diff --git a/src/plugins/plugin_xep_0260.py b/sat/plugins/plugin_xep_0260.py similarity index 100% rename from src/plugins/plugin_xep_0260.py rename to sat/plugins/plugin_xep_0260.py diff --git a/src/plugins/plugin_xep_0261.py b/sat/plugins/plugin_xep_0261.py similarity index 100% rename from src/plugins/plugin_xep_0261.py rename to sat/plugins/plugin_xep_0261.py diff --git a/src/plugins/plugin_xep_0264.py b/sat/plugins/plugin_xep_0264.py similarity index 100% rename from src/plugins/plugin_xep_0264.py rename to sat/plugins/plugin_xep_0264.py diff --git a/src/plugins/plugin_xep_0277.py b/sat/plugins/plugin_xep_0277.py similarity index 100% rename from src/plugins/plugin_xep_0277.py rename to sat/plugins/plugin_xep_0277.py diff --git a/src/plugins/plugin_xep_0280.py b/sat/plugins/plugin_xep_0280.py similarity index 100% rename from src/plugins/plugin_xep_0280.py rename to sat/plugins/plugin_xep_0280.py diff --git a/src/plugins/plugin_xep_0297.py b/sat/plugins/plugin_xep_0297.py similarity index 100% rename from src/plugins/plugin_xep_0297.py rename to sat/plugins/plugin_xep_0297.py diff --git a/src/plugins/plugin_xep_0300.py b/sat/plugins/plugin_xep_0300.py similarity index 100% rename from src/plugins/plugin_xep_0300.py rename to sat/plugins/plugin_xep_0300.py diff --git a/src/plugins/plugin_xep_0313.py b/sat/plugins/plugin_xep_0313.py similarity index 100% rename from src/plugins/plugin_xep_0313.py rename to sat/plugins/plugin_xep_0313.py diff --git a/src/plugins/plugin_xep_0329.py b/sat/plugins/plugin_xep_0329.py similarity index 100% rename from src/plugins/plugin_xep_0329.py rename to sat/plugins/plugin_xep_0329.py diff --git a/src/plugins/plugin_xep_0334.py b/sat/plugins/plugin_xep_0334.py similarity index 100% rename from src/plugins/plugin_xep_0334.py rename to sat/plugins/plugin_xep_0334.py diff --git a/src/plugins/plugin_xep_0363.py b/sat/plugins/plugin_xep_0363.py similarity index 100% rename from src/plugins/plugin_xep_0363.py rename to sat/plugins/plugin_xep_0363.py diff --git a/src/bridge/bridge_constructor/constructors/dbus/__init__.py b/sat/stdui/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/dbus/__init__.py rename to sat/stdui/__init__.py diff --git a/src/stdui/ui_contact_list.py b/sat/stdui/ui_contact_list.py similarity index 100% rename from src/stdui/ui_contact_list.py rename to sat/stdui/ui_contact_list.py diff --git a/src/stdui/ui_profile_manager.py b/sat/stdui/ui_profile_manager.py similarity index 100% rename from src/stdui/ui_profile_manager.py rename to sat/stdui/ui_profile_manager.py diff --git a/src/bridge/bridge_constructor/constructors/embedded/__init__.py b/sat/test/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/embedded/__init__.py rename to sat/test/__init__.py diff --git a/src/test/constants.py b/sat/test/constants.py similarity index 100% rename from src/test/constants.py rename to sat/test/constants.py diff --git a/src/test/helpers.py b/sat/test/helpers.py similarity index 100% rename from src/test/helpers.py rename to sat/test/helpers.py diff --git a/src/test/helpers_plugins.py b/sat/test/helpers_plugins.py similarity index 100% rename from src/test/helpers_plugins.py rename to sat/test/helpers_plugins.py diff --git a/src/test/test_core_xmpp.py b/sat/test/test_core_xmpp.py similarity index 100% rename from src/test/test_core_xmpp.py rename to sat/test/test_core_xmpp.py diff --git a/src/test/test_helpers_plugins.py b/sat/test/test_helpers_plugins.py similarity index 100% rename from src/test/test_helpers_plugins.py rename to sat/test/test_helpers_plugins.py diff --git a/src/test/test_memory.py b/sat/test/test_memory.py similarity index 100% rename from src/test/test_memory.py rename to sat/test/test_memory.py diff --git a/src/test/test_memory_crypto.py b/sat/test/test_memory_crypto.py similarity index 100% rename from src/test/test_memory_crypto.py rename to sat/test/test_memory_crypto.py diff --git a/src/test/test_plugin_misc_groupblog.py b/sat/test/test_plugin_misc_groupblog.py similarity index 100% rename from src/test/test_plugin_misc_groupblog.py rename to sat/test/test_plugin_misc_groupblog.py diff --git a/src/test/test_plugin_misc_radiocol.py b/sat/test/test_plugin_misc_radiocol.py similarity index 100% rename from src/test/test_plugin_misc_radiocol.py rename to sat/test/test_plugin_misc_radiocol.py diff --git a/src/test/test_plugin_misc_room_game.py b/sat/test/test_plugin_misc_room_game.py similarity index 100% rename from src/test/test_plugin_misc_room_game.py rename to sat/test/test_plugin_misc_room_game.py diff --git a/src/test/test_plugin_misc_text_syntaxes.py b/sat/test/test_plugin_misc_text_syntaxes.py similarity index 100% rename from src/test/test_plugin_misc_text_syntaxes.py rename to sat/test/test_plugin_misc_text_syntaxes.py diff --git a/src/test/test_plugin_xep_0033.py b/sat/test/test_plugin_xep_0033.py similarity index 100% rename from src/test/test_plugin_xep_0033.py rename to sat/test/test_plugin_xep_0033.py diff --git a/src/test/test_plugin_xep_0085.py b/sat/test/test_plugin_xep_0085.py similarity index 100% rename from src/test/test_plugin_xep_0085.py rename to sat/test/test_plugin_xep_0085.py diff --git a/src/test/test_plugin_xep_0203.py b/sat/test/test_plugin_xep_0203.py similarity index 100% rename from src/test/test_plugin_xep_0203.py rename to sat/test/test_plugin_xep_0203.py diff --git a/src/test/test_plugin_xep_0277.py b/sat/test/test_plugin_xep_0277.py similarity index 100% rename from src/test/test_plugin_xep_0277.py rename to sat/test/test_plugin_xep_0277.py diff --git a/src/test/test_plugin_xep_0297.py b/sat/test/test_plugin_xep_0297.py similarity index 100% rename from src/test/test_plugin_xep_0297.py rename to sat/test/test_plugin_xep_0297.py diff --git a/src/test/test_plugin_xep_0313.py b/sat/test/test_plugin_xep_0313.py similarity index 100% rename from src/test/test_plugin_xep_0313.py rename to sat/test/test_plugin_xep_0313.py diff --git a/src/test/test_plugin_xep_0334.py b/sat/test/test_plugin_xep_0334.py similarity index 100% rename from src/test/test_plugin_xep_0334.py rename to sat/test/test_plugin_xep_0334.py diff --git a/src/bridge/bridge_constructor/constructors/mediawiki/__init__.py b/sat/tools/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/mediawiki/__init__.py rename to sat/tools/__init__.py diff --git a/src/bridge/bridge_constructor/constructors/pb/__init__.py b/sat/tools/common/__init__.py similarity index 100% rename from src/bridge/bridge_constructor/constructors/pb/__init__.py rename to sat/tools/common/__init__.py diff --git a/src/tools/common/ansi.py b/sat/tools/common/ansi.py similarity index 100% rename from src/tools/common/ansi.py rename to sat/tools/common/ansi.py diff --git a/src/tools/common/data_format.py b/sat/tools/common/data_format.py similarity index 100% rename from src/tools/common/data_format.py rename to sat/tools/common/data_format.py diff --git a/src/tools/common/data_objects.py b/sat/tools/common/data_objects.py similarity index 100% rename from src/tools/common/data_objects.py rename to sat/tools/common/data_objects.py diff --git a/src/tools/common/dynamic_import.py b/sat/tools/common/dynamic_import.py similarity index 100% rename from src/tools/common/dynamic_import.py rename to sat/tools/common/dynamic_import.py diff --git a/src/tools/common/regex.py b/sat/tools/common/regex.py similarity index 100% rename from src/tools/common/regex.py rename to sat/tools/common/regex.py diff --git a/src/tools/common/template.py b/sat/tools/common/template.py similarity index 100% rename from src/tools/common/template.py rename to sat/tools/common/template.py diff --git a/src/tools/common/template_xmlui.py b/sat/tools/common/template_xmlui.py similarity index 100% rename from src/tools/common/template_xmlui.py rename to sat/tools/common/template_xmlui.py diff --git a/src/tools/common/uri.py b/sat/tools/common/uri.py similarity index 100% rename from src/tools/common/uri.py rename to sat/tools/common/uri.py diff --git a/src/tools/config.py b/sat/tools/config.py similarity index 100% rename from src/tools/config.py rename to sat/tools/config.py diff --git a/src/tools/email.py b/sat/tools/email.py similarity index 100% rename from src/tools/email.py rename to sat/tools/email.py diff --git a/src/tools/sat_defer.py b/sat/tools/sat_defer.py similarity index 100% rename from src/tools/sat_defer.py rename to sat/tools/sat_defer.py diff --git a/src/tools/stream.py b/sat/tools/stream.py similarity index 100% rename from src/tools/stream.py rename to sat/tools/stream.py diff --git a/src/tools/trigger.py b/sat/tools/trigger.py similarity index 100% rename from src/tools/trigger.py rename to sat/tools/trigger.py diff --git a/src/tools/utils.py b/sat/tools/utils.py similarity index 100% rename from src/tools/utils.py rename to sat/tools/utils.py diff --git a/src/tools/xml_tools.py b/sat/tools/xml_tools.py similarity index 100% rename from src/tools/xml_tools.py rename to sat/tools/xml_tools.py diff --git a/src/core/__init__.py b/sat_frontends/__init__.py similarity index 100% rename from src/core/__init__.py rename to sat_frontends/__init__.py diff --git a/src/memory/__init__.py b/sat_frontends/bridge/__init__.py similarity index 100% rename from src/memory/__init__.py rename to sat_frontends/bridge/__init__.py diff --git a/frontends/src/bridge/bridge_frontend.py b/sat_frontends/bridge/bridge_frontend.py similarity index 100% rename from frontends/src/bridge/bridge_frontend.py rename to sat_frontends/bridge/bridge_frontend.py diff --git a/frontends/src/bridge/dbus_bridge.py b/sat_frontends/bridge/dbus_bridge.py similarity index 100% rename from frontends/src/bridge/dbus_bridge.py rename to sat_frontends/bridge/dbus_bridge.py diff --git a/src/stdui/__init__.py b/sat_frontends/jp/__init__.py similarity index 100% rename from src/stdui/__init__.py rename to sat_frontends/jp/__init__.py diff --git a/frontends/src/jp/arg_tools.py b/sat_frontends/jp/arg_tools.py similarity index 100% rename from frontends/src/jp/arg_tools.py rename to sat_frontends/jp/arg_tools.py diff --git a/frontends/src/jp/base.py b/sat_frontends/jp/base.py similarity index 100% rename from frontends/src/jp/base.py rename to sat_frontends/jp/base.py diff --git a/frontends/src/jp/cmd_account.py b/sat_frontends/jp/cmd_account.py similarity index 100% rename from frontends/src/jp/cmd_account.py rename to sat_frontends/jp/cmd_account.py diff --git a/frontends/src/jp/cmd_adhoc.py b/sat_frontends/jp/cmd_adhoc.py similarity index 100% rename from frontends/src/jp/cmd_adhoc.py rename to sat_frontends/jp/cmd_adhoc.py diff --git a/frontends/src/jp/cmd_avatar.py b/sat_frontends/jp/cmd_avatar.py similarity index 100% rename from frontends/src/jp/cmd_avatar.py rename to sat_frontends/jp/cmd_avatar.py diff --git a/frontends/src/jp/cmd_blog.py b/sat_frontends/jp/cmd_blog.py similarity index 100% rename from frontends/src/jp/cmd_blog.py rename to sat_frontends/jp/cmd_blog.py diff --git a/frontends/src/jp/cmd_bookmarks.py b/sat_frontends/jp/cmd_bookmarks.py similarity index 100% rename from frontends/src/jp/cmd_bookmarks.py rename to sat_frontends/jp/cmd_bookmarks.py diff --git a/frontends/src/jp/cmd_debug.py b/sat_frontends/jp/cmd_debug.py similarity index 100% rename from frontends/src/jp/cmd_debug.py rename to sat_frontends/jp/cmd_debug.py diff --git a/frontends/src/jp/cmd_event.py b/sat_frontends/jp/cmd_event.py similarity index 100% rename from frontends/src/jp/cmd_event.py rename to sat_frontends/jp/cmd_event.py diff --git a/frontends/src/jp/cmd_file.py b/sat_frontends/jp/cmd_file.py similarity index 100% rename from frontends/src/jp/cmd_file.py rename to sat_frontends/jp/cmd_file.py diff --git a/frontends/src/jp/cmd_forums.py b/sat_frontends/jp/cmd_forums.py similarity index 100% rename from frontends/src/jp/cmd_forums.py rename to sat_frontends/jp/cmd_forums.py diff --git a/frontends/src/jp/cmd_identity.py b/sat_frontends/jp/cmd_identity.py similarity index 100% rename from frontends/src/jp/cmd_identity.py rename to sat_frontends/jp/cmd_identity.py diff --git a/frontends/src/jp/cmd_info.py b/sat_frontends/jp/cmd_info.py similarity index 100% rename from frontends/src/jp/cmd_info.py rename to sat_frontends/jp/cmd_info.py diff --git a/frontends/src/jp/cmd_input.py b/sat_frontends/jp/cmd_input.py similarity index 100% rename from frontends/src/jp/cmd_input.py rename to sat_frontends/jp/cmd_input.py diff --git a/frontends/src/jp/cmd_invitation.py b/sat_frontends/jp/cmd_invitation.py similarity index 100% rename from frontends/src/jp/cmd_invitation.py rename to sat_frontends/jp/cmd_invitation.py diff --git a/frontends/src/jp/cmd_merge_request.py b/sat_frontends/jp/cmd_merge_request.py similarity index 100% rename from frontends/src/jp/cmd_merge_request.py rename to sat_frontends/jp/cmd_merge_request.py diff --git a/frontends/src/jp/cmd_message.py b/sat_frontends/jp/cmd_message.py similarity index 100% rename from frontends/src/jp/cmd_message.py rename to sat_frontends/jp/cmd_message.py diff --git a/frontends/src/jp/cmd_param.py b/sat_frontends/jp/cmd_param.py similarity index 100% rename from frontends/src/jp/cmd_param.py rename to sat_frontends/jp/cmd_param.py diff --git a/frontends/src/jp/cmd_pipe.py b/sat_frontends/jp/cmd_pipe.py similarity index 100% rename from frontends/src/jp/cmd_pipe.py rename to sat_frontends/jp/cmd_pipe.py diff --git a/frontends/src/jp/cmd_profile.py b/sat_frontends/jp/cmd_profile.py similarity index 100% rename from frontends/src/jp/cmd_profile.py rename to sat_frontends/jp/cmd_profile.py diff --git a/frontends/src/jp/cmd_pubsub.py b/sat_frontends/jp/cmd_pubsub.py similarity index 100% rename from frontends/src/jp/cmd_pubsub.py rename to sat_frontends/jp/cmd_pubsub.py diff --git a/frontends/src/jp/cmd_roster.py b/sat_frontends/jp/cmd_roster.py similarity index 100% rename from frontends/src/jp/cmd_roster.py rename to sat_frontends/jp/cmd_roster.py diff --git a/frontends/src/jp/cmd_shell.py b/sat_frontends/jp/cmd_shell.py similarity index 100% rename from frontends/src/jp/cmd_shell.py rename to sat_frontends/jp/cmd_shell.py diff --git a/frontends/src/jp/cmd_ticket.py b/sat_frontends/jp/cmd_ticket.py similarity index 100% rename from frontends/src/jp/cmd_ticket.py rename to sat_frontends/jp/cmd_ticket.py diff --git a/frontends/src/jp/cmd_uri.py b/sat_frontends/jp/cmd_uri.py similarity index 100% rename from frontends/src/jp/cmd_uri.py rename to sat_frontends/jp/cmd_uri.py diff --git a/frontends/src/jp/common.py b/sat_frontends/jp/common.py similarity index 100% rename from frontends/src/jp/common.py rename to sat_frontends/jp/common.py diff --git a/frontends/src/jp/constants.py b/sat_frontends/jp/constants.py similarity index 100% rename from frontends/src/jp/constants.py rename to sat_frontends/jp/constants.py diff --git a/frontends/src/jp/jp b/sat_frontends/jp/jp similarity index 100% rename from frontends/src/jp/jp rename to sat_frontends/jp/jp diff --git a/frontends/src/jp/output_std.py b/sat_frontends/jp/output_std.py similarity index 100% rename from frontends/src/jp/output_std.py rename to sat_frontends/jp/output_std.py diff --git a/frontends/src/jp/output_template.py b/sat_frontends/jp/output_template.py similarity index 100% rename from frontends/src/jp/output_template.py rename to sat_frontends/jp/output_template.py diff --git a/frontends/src/jp/output_xml.py b/sat_frontends/jp/output_xml.py similarity index 100% rename from frontends/src/jp/output_xml.py rename to sat_frontends/jp/output_xml.py diff --git a/frontends/src/jp/xmlui_manager.py b/sat_frontends/jp/xmlui_manager.py similarity index 100% rename from frontends/src/jp/xmlui_manager.py rename to sat_frontends/jp/xmlui_manager.py diff --git a/src/test/__init__.py b/sat_frontends/primitivus/__init__.py similarity index 100% rename from src/test/__init__.py rename to sat_frontends/primitivus/__init__.py diff --git a/frontends/src/primitivus/chat.py b/sat_frontends/primitivus/chat.py similarity index 100% rename from frontends/src/primitivus/chat.py rename to sat_frontends/primitivus/chat.py diff --git a/frontends/src/primitivus/config.py b/sat_frontends/primitivus/config.py similarity index 100% rename from frontends/src/primitivus/config.py rename to sat_frontends/primitivus/config.py diff --git a/frontends/src/primitivus/constants.py b/sat_frontends/primitivus/constants.py similarity index 100% rename from frontends/src/primitivus/constants.py rename to sat_frontends/primitivus/constants.py diff --git a/frontends/src/primitivus/contact_list.py b/sat_frontends/primitivus/contact_list.py similarity index 100% rename from frontends/src/primitivus/contact_list.py rename to sat_frontends/primitivus/contact_list.py diff --git a/frontends/src/primitivus/game_tarot.py b/sat_frontends/primitivus/game_tarot.py similarity index 100% rename from frontends/src/primitivus/game_tarot.py rename to sat_frontends/primitivus/game_tarot.py diff --git a/frontends/src/primitivus/keys.py b/sat_frontends/primitivus/keys.py similarity index 100% rename from frontends/src/primitivus/keys.py rename to sat_frontends/primitivus/keys.py diff --git a/frontends/src/primitivus/notify.py b/sat_frontends/primitivus/notify.py similarity index 100% rename from frontends/src/primitivus/notify.py rename to sat_frontends/primitivus/notify.py diff --git a/frontends/src/primitivus/primitivus b/sat_frontends/primitivus/primitivus similarity index 100% rename from frontends/src/primitivus/primitivus rename to sat_frontends/primitivus/primitivus diff --git a/frontends/src/primitivus/profile_manager.py b/sat_frontends/primitivus/profile_manager.py similarity index 100% rename from frontends/src/primitivus/profile_manager.py rename to sat_frontends/primitivus/profile_manager.py diff --git a/frontends/src/primitivus/progress.py b/sat_frontends/primitivus/progress.py similarity index 100% rename from frontends/src/primitivus/progress.py rename to sat_frontends/primitivus/progress.py diff --git a/frontends/src/primitivus/status.py b/sat_frontends/primitivus/status.py similarity index 100% rename from frontends/src/primitivus/status.py rename to sat_frontends/primitivus/status.py diff --git a/frontends/src/primitivus/widget.py b/sat_frontends/primitivus/widget.py similarity index 100% rename from frontends/src/primitivus/widget.py rename to sat_frontends/primitivus/widget.py diff --git a/frontends/src/primitivus/xmlui.py b/sat_frontends/primitivus/xmlui.py similarity index 100% rename from frontends/src/primitivus/xmlui.py rename to sat_frontends/primitivus/xmlui.py diff --git a/src/tools/__init__.py b/sat_frontends/quick_frontend/__init__.py similarity index 100% rename from src/tools/__init__.py rename to sat_frontends/quick_frontend/__init__.py diff --git a/frontends/src/quick_frontend/constants.py b/sat_frontends/quick_frontend/constants.py similarity index 100% rename from frontends/src/quick_frontend/constants.py rename to sat_frontends/quick_frontend/constants.py diff --git a/frontends/src/quick_frontend/quick_app.py b/sat_frontends/quick_frontend/quick_app.py similarity index 100% rename from frontends/src/quick_frontend/quick_app.py rename to sat_frontends/quick_frontend/quick_app.py diff --git a/frontends/src/quick_frontend/quick_blog.py b/sat_frontends/quick_frontend/quick_blog.py similarity index 100% rename from frontends/src/quick_frontend/quick_blog.py rename to sat_frontends/quick_frontend/quick_blog.py diff --git a/frontends/src/quick_frontend/quick_chat.py b/sat_frontends/quick_frontend/quick_chat.py similarity index 100% rename from frontends/src/quick_frontend/quick_chat.py rename to sat_frontends/quick_frontend/quick_chat.py diff --git a/frontends/src/quick_frontend/quick_contact_list.py b/sat_frontends/quick_frontend/quick_contact_list.py similarity index 100% rename from frontends/src/quick_frontend/quick_contact_list.py rename to sat_frontends/quick_frontend/quick_contact_list.py diff --git a/frontends/src/quick_frontend/quick_contact_management.py b/sat_frontends/quick_frontend/quick_contact_management.py similarity index 100% rename from frontends/src/quick_frontend/quick_contact_management.py rename to sat_frontends/quick_frontend/quick_contact_management.py diff --git a/frontends/src/quick_frontend/quick_game_tarot.py b/sat_frontends/quick_frontend/quick_game_tarot.py similarity index 100% rename from frontends/src/quick_frontend/quick_game_tarot.py rename to sat_frontends/quick_frontend/quick_game_tarot.py diff --git a/frontends/src/quick_frontend/quick_games.py b/sat_frontends/quick_frontend/quick_games.py similarity index 100% rename from frontends/src/quick_frontend/quick_games.py rename to sat_frontends/quick_frontend/quick_games.py diff --git a/frontends/src/quick_frontend/quick_list_manager.py b/sat_frontends/quick_frontend/quick_list_manager.py similarity index 100% rename from frontends/src/quick_frontend/quick_list_manager.py rename to sat_frontends/quick_frontend/quick_list_manager.py diff --git a/frontends/src/quick_frontend/quick_menus.py b/sat_frontends/quick_frontend/quick_menus.py similarity index 100% rename from frontends/src/quick_frontend/quick_menus.py rename to sat_frontends/quick_frontend/quick_menus.py diff --git a/frontends/src/quick_frontend/quick_profile_manager.py b/sat_frontends/quick_frontend/quick_profile_manager.py similarity index 100% rename from frontends/src/quick_frontend/quick_profile_manager.py rename to sat_frontends/quick_frontend/quick_profile_manager.py diff --git a/frontends/src/quick_frontend/quick_utils.py b/sat_frontends/quick_frontend/quick_utils.py similarity index 100% rename from frontends/src/quick_frontend/quick_utils.py rename to sat_frontends/quick_frontend/quick_utils.py diff --git a/frontends/src/quick_frontend/quick_widgets.py b/sat_frontends/quick_frontend/quick_widgets.py similarity index 100% rename from frontends/src/quick_frontend/quick_widgets.py rename to sat_frontends/quick_frontend/quick_widgets.py diff --git a/src/tools/common/__init__.py b/sat_frontends/tools/__init__.py similarity index 100% rename from src/tools/common/__init__.py rename to sat_frontends/tools/__init__.py diff --git a/frontends/src/tools/composition.py b/sat_frontends/tools/composition.py similarity index 100% rename from frontends/src/tools/composition.py rename to sat_frontends/tools/composition.py diff --git a/frontends/src/tools/css_color.py b/sat_frontends/tools/css_color.py similarity index 100% rename from frontends/src/tools/css_color.py rename to sat_frontends/tools/css_color.py diff --git a/frontends/src/tools/games.py b/sat_frontends/tools/games.py similarity index 100% rename from frontends/src/tools/games.py rename to sat_frontends/tools/games.py diff --git a/frontends/src/tools/host_listener.py b/sat_frontends/tools/host_listener.py similarity index 100% rename from frontends/src/tools/host_listener.py rename to sat_frontends/tools/host_listener.py diff --git a/frontends/src/tools/jid.py b/sat_frontends/tools/jid.py similarity index 100% rename from frontends/src/tools/jid.py rename to sat_frontends/tools/jid.py diff --git a/frontends/src/tools/misc.py b/sat_frontends/tools/misc.py similarity index 100% rename from frontends/src/tools/misc.py rename to sat_frontends/tools/misc.py diff --git a/frontends/src/tools/strings.py b/sat_frontends/tools/strings.py similarity index 100% rename from frontends/src/tools/strings.py rename to sat_frontends/tools/strings.py diff --git a/frontends/src/tools/xmltools.py b/sat_frontends/tools/xmltools.py similarity index 100% rename from frontends/src/tools/xmltools.py rename to sat_frontends/tools/xmltools.py diff --git a/frontends/src/tools/xmlui.py b/sat_frontends/tools/xmlui.py similarity index 100% rename from frontends/src/tools/xmlui.py rename to sat_frontends/tools/xmlui.py diff --git a/setup.py b/setup.py index 5d881c55..9cb5e265 100644 --- a/setup.py +++ b/setup.py @@ -18,291 +18,64 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from ez_setup import use_setuptools -use_setuptools() -from setuptools.command.install import install -from setuptools import setup -from distutils.file_util import copy_file +from setuptools import setup, find_packages import os -import os.path import sys -import subprocess -from stat import ST_MODE -import shutil -import re - -# seen here: http://stackoverflow.com/questions/7275295 -try: - from setuptools.command import egg_info - egg_info.write_toplevel_names -except (ImportError, AttributeError): - pass -else: - def _top_level_package(name): - return name.split('.', 1)[0] - - def _hacked_write_toplevel_names(cmd, basename, filename): - pkgs = dict.fromkeys( - [_top_level_package(k) - for k in cmd.distribution.iter_distribution_names() - if _top_level_package(k) != "twisted" - ] - ) - cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n') - - egg_info.write_toplevel_names = _hacked_write_toplevel_names - NAME = 'sat' -LAUNCH_DAEMON_COMMAND = 'sat' -ENV_SAT_INSTALL = "SAT_INSTALL" # environment variable to customise installation -NO_PREINSTALL_OPT = 'nopreinstall' # skip all preinstallation checks -AUTO_DEB_OPT = 'autodeb' # automaticaly install debs -CLEAN_OPT = 'clean' # remove previous installation directories -PURGE_OPT = 'purge' # remove building and previous installation directories +install_requires = [ + 'babel', + 'dbus-python', + 'html2text', + 'jinja2', + 'langid', + 'lxml >= 3.1.0', + 'markdown', + 'miniupnpc', + 'mutagen', + 'netifaces', + 'pillow', + 'progressbar', + 'pycrypto >= 2.6.1', + 'pygments', + 'pygobject', + 'PyOpenSSL', + 'python-potr', + 'pyxdg', + 'sat_tmp', + 'service_identity', + 'shortuuid', + 'twisted >= 15.2.0', + 'urwid >= 1.2.0', + 'urwid-satext >= 0.6.1', + 'wokkel >= 0.7.1', +] + + DBUS_DIR = 'dbus-1/services' DBUS_FILE = 'misc/org.goffi.SAT.service' -# Following map describe file to adapt with installation path: -# key is the self attribute to get (e.g.: sh_script_path will modify self.sh_script_path file) -# value is a dict where key is the regex of the part to change, and value is either the string -# to replace or a tuple with a template and values to replace (if value to replace is a string, -# the attribute from self with that name will be used). -FILE_ADJ = {'sh_script_path': {r'PYTHON *=.*': 'PYTHON="{}"'.format(sys.executable)}, - 'dbus_service_path': {r'Exec *=.*': ('Exec={}', 'sh_script_path_final')}, - } - - -class MercurialException(Exception): - pass - - -def module_installed(module_name): - """Try to import module_name, and return False if it failed - @param module_name: name of the module to test - @return: True if successful""" - try: - __import__(module_name) - except ImportError: - return False - return True - - -class CustomInstall(install): - - def adapt_files(self): - """Adapt files to installed environments - - Mainly change the paths - """ - def adapter(ordered_replace, match_obj): - """do file adjustment, getting self attribute when needed""" - idx = match_obj.lastindex - 1 - repl_data = ordered_replace[idx][1] - if isinstance(repl_data, tuple): - template = repl_data[0] - args = [getattr(self, arg) if isinstance(arg, basestring) else arg for arg in repl_data[1:]] - return template.format(*args) - return repl_data - - for file_attr, replace_data in FILE_ADJ.iteritems(): - file_path = getattr(self, file_attr) - ordered_replace = [(regex, repl) for regex, repl in replace_data.iteritems()] - regex = '|'.join(('({})'.format(regex) for regex, dummy in ordered_replace)) - with open(file_path, 'r') as f: - buff = f.read() - buff = re.sub(regex, lambda match_obj: adapter(ordered_replace, match_obj), buff) - with open(file_path, 'w') as f: - f.write(buff) - - def custom_create_links(self): - """Create symbolic links to executables""" - # the script which launch the daemon - for source, dest in self.sh_script_links: - if self.root is None: - if os.path.islink(dest) and os.readlink(dest) != source: - os.remove(dest) # copy_file doesn't force the link update - dest_name, copied = copy_file(source, dest, link='sym') - assert copied - # we change the perm in the same way as in the original install_scripts - mode = ((os.stat(dest_name)[ST_MODE]) | 0555) & 07777 - os.chmod(dest_name, mode) - else: - # if root is not None, source probably doesn't exist yet - # this is not managed by copy_file, so we must use os.symlink directly - if os.path.islink(dest): - os.remove(dest) # symlink doesn't force the link update - os.symlink(source, dest) - - def run(self): - if not self.root: - ignore_idx = 0 - else: - ignore_idx = len(self.root) - if self.root[-1] == '/': - ignore_idx-=1 # we dont want to remove the first '/' in _final paths - # _final suffixed attributes are the ones without the self.root prefix path - # it's used at least on Arch linux installation as install is made on a local $pkgdir - # which is later moved to user's FS root - self.install_lib_final = self.install_lib[ignore_idx:] - self.sh_script_path = os.path.join(self.install_lib, NAME, 'sat.sh') - self.sh_script_path_final = os.path.join(self.install_lib_final, NAME, 'sat.sh') - self.sh_script_links = [(self.sh_script_path_final, os.path.join(self.install_scripts, LAUNCH_DAEMON_COMMAND))] - self.dbus_service_path = os.path.join(self.install_data, 'share', DBUS_DIR, os.path.basename(DBUS_FILE)) - sys.stdout.write('running pre installation stuff\n') - sys.stdout.flush() - if PURGE_OPT in install_opt: - self.purge() - elif CLEAN_OPT in install_opt: - self.clean() - install.run(self) - sys.stdout.write('running post installation stuff\n') - sys.stdout.flush() - self.adapt_files() - self.custom_create_links() - - def confirm(self, message): - """Ask the user for a confirmation""" - message += 'Proceed' - while True: - res = raw_input("%s (y/n)? " % message) - if res not in ['y', 'Y', 'n', 'N']: - print "Your response ('%s') was not one of the expected responses: y, n" % res - message = 'Proceed' - continue - if res in ('y', 'Y'): - return True - return False - - def clean(self, message=None, to_remove=None): - """Clean previous installation directories - - @param message (str): to use a non-default confirmation message - @param to_remove (str): extra files/directories to remove - """ - if message is None: - message = "Cleaning previous installation directories" - if to_remove is None: - to_remove = [] - for path in [os.path.join(self.install_lib, NAME), - os.path.join(self.install_lib, "%s_frontends" % NAME), - os.path.join(self.install_data, 'share', 'doc', NAME), - os.path.join(self.install_lib, "%s.egg-info" % self.config_vars['dist_fullname']), - os.path.join(self.install_lib, "%s-py%s.egg-info" % (self.config_vars['dist_fullname'], self.config_vars['py_version_short'])), - ]: - if os.path.isdir(path): - to_remove.append(path) - for source, dest in self.sh_script_links: - if os.path.islink(dest): - to_remove.append(dest) - - for script in ('jp', 'primitivus'): - dest = os.path.join(self.install_scripts, script) - if os.path.exists(dest): - to_remove.append(dest) - - message = "%s:\n%s\n" % (message, "\n".join([" %s" % path for path in to_remove])) - if not self.confirm(message): - return - sys.stdout.write('cleaning previous installation directories...\n') - sys.stdout.flush() - for path in to_remove: - if os.path.isdir(path): - shutil.rmtree(path, ignore_errors=True) - else: - os.remove(path) - - def purge(self): - """Clean building and previous installation directories""" - message = "Cleaning building and previous installation directories" - to_remove = [os.path.join(os.getcwd(), 'build')] - self.clean(message, to_remove) - - -def preinstall_check(install_opt): - """Check presence of problematic dependencies, and try to install them with package manager - This ugly stuff is necessary as distributions are not installed correctly with setuptools/distribute - Hope to remove this at some point""" - - #modules_tocheck = ['twisted', 'twisted.words', 'twisted.web', 'urwid'] - modules_tocheck = ['gobject'] # XXX: python-gobject is not up-to-date in PyPi - - package = {'twisted': 'python-twisted-core', - 'twisted.words': 'python-twisted-words', - 'twisted.web': 'python-twisted-web', - 'urwid': 'python-urwid', - 'gobject': 'python-gobject', - 'mercurial': 'mercurial'} # this dict map dependencies to packages names for debian distributions - - sys.stdout.write("Running pre-installation dependencies check\n") - - # which modules are not installed ? - modules_toinstall = [mod for mod in modules_tocheck if not module_installed(mod)] - """# is mercurial available ? - hg_installed = subprocess.call('which hg', stdout=open('/dev/null', 'w'), shell=True) == 0 - if not hg_installed: - modules_toinstall.append('mercurial')""" # hg can be installed from pypi - - if modules_toinstall: - if AUTO_DEB_OPT in install_opt: # auto debian installation is requested - # are we on a distribution using apt ? - apt_path = subprocess.Popen('which apt-get', stdout=subprocess.PIPE, shell=True).communicate()[0][:-1] - else: - apt_path = None - - not_installed = set() - if apt_path: - # we have apt, we'll try to use it - for module_name in modules_toinstall: - package_name = package[module_name] - sys.stdout.write("Installing %s\n" % package_name) - # TODO: use sudo to get root rights - success = subprocess.call('%s -qy install %s' % (apt_path, package_name), shell=True) == 0 - if not success: - not_installed.add(module_name) - else: - not_installed = set(modules_toinstall) - - if not_installed: - # some packages can't be automatically installed, we print their name for manual installation - sys.stdout.write("You should install the following dependencies with your distribution recommanded tool before installing %s:\n" % NAME) - for module_name in not_installed: - sys.stdout.write("- %s (Debian name: %s)\n" % (module_name, package[module_name])) - sys.exit(2) - - -if sys.argv[1].lower() in ['egg_info', 'install']: - # we only check dependencies if egg_info or install is used - install_opt = os.environ.get(ENV_SAT_INSTALL, "").split() - if not NO_PREINSTALL_OPT in install_opt: # user can force preinstall skipping - preinstall_check(install_opt) - setup(name=NAME, version='0.6.1.1', - description=u'Salut à Toi multi-frontend XMPP client', - long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi-frontends (desktop, web, console interface, CLI, etc) and multi-purposes (instant messaging, microblogging, games, file sharing, etc).', + description=u'Salut à Toi multipurpose and multi frontend XMPP client', + long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi frontend (desktop, web, console interface, CLI, etc) and multipurpose (instant messaging, microblogging, games, file sharing, etc).', author='Association « Salut à Toi »', author_email='contact@goffi.org', - url='http://salut-a-toi.org', + url='https://salut-a-toi.org', classifiers=['Development Status :: 3 - Alpha', 'Environment :: Console', - 'Environment :: X11 Applications :: GTK', 'Framework :: Twisted', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Operating System :: POSIX :: Linux', 'Topic :: Communications :: Chat'], - package_dir={'sat': 'src', 'sat_frontends': 'frontends/src', 'twisted.plugins': 'src/twisted/plugins'}, - packages=['sat', 'sat.tools', 'sat.tools.common', 'sat.bridge', 'sat.plugins', 'sat.test', 'sat.core', 'sat.memory', - 'sat_frontends', 'sat_frontends.bridge', 'sat_frontends.quick_frontend', 'sat_frontends.jp', - 'sat_frontends.primitivus', 'sat_frontends.tools', 'sat.stdui', 'twisted.plugins'], - package_data={'sat': ['sat.sh'], }, + packages=find_packages() + ['twisted.plugins'], data_files=[(os.path.join(sys.prefix, 'share/locale/fr/LC_MESSAGES'), ['i18n/fr/LC_MESSAGES/sat.mo']), - ('share/doc/%s' % NAME, ['CHANGELOG', 'COPYING', 'INSTALL', 'README', 'README4TRANSLATORS']), - (os.path.join('share', DBUS_DIR), (DBUS_FILE,)), + (os.path.join('share/doc', NAME), ['CHANGELOG', 'COPYING', 'INSTALL', 'README', 'README4TRANSLATORS']), + (os.path.join('share', DBUS_DIR), [DBUS_FILE]), ], - scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', ], + scripts=['sat_frontends/jp/jp', 'sat_frontends/primitivus/primitivus', 'bin/sat'], zip_safe=False, - install_requires=['twisted >= 15.2.0', 'wokkel >= 0.7.1', 'sat_tmp', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.6.1', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL', 'service_identity', 'shortuuid', 'babel', 'pygments'], - cmdclass={'install': CustomInstall}, + install_requires=install_requires, + python_requires='~=2.7', ) diff --git a/src/twisted/plugins/sat_plugin.py b/twisted/plugins/sat_plugin.py similarity index 96% rename from src/twisted/plugins/sat_plugin.py rename to twisted/plugins/sat_plugin.py index d9583ea1..733e025b 100644 --- a/src/twisted/plugins/sat_plugin.py +++ b/twisted/plugins/sat_plugin.py @@ -40,8 +40,8 @@ from sat.core.i18n import _ def initialise(options): """Method to initialise global modules""" - from twisted.internet import glib2reactor - glib2reactor.install() + from twisted.internet import gtk3reactor + gtk3reactor.install() # XXX: We need to configure logs before any log method is used, so here is the best place. from sat.core import log_config log_config.satConfigure(C.LOG_BACKEND_TWISTED, C, backend_data=options)