From 4b3e6560a10fb1de43fc244ec9f658607aa45d8e Mon Sep 17 00:00:00 2001 From: Rimas Kudelis Date: Sun, 3 Aug 2014 12:59:58 +0300 Subject: [PATCH] Remove psyco support. Since Psyco is now unmaintained and dead (see http://psyco.sourceforge.net/) it is time to remove this. The projects recommendation is to use pypy instead. --- bin/virtaal | 6 ------ docs/building.rst | 1 - setup.py | 4 ++-- virtaal/plugins/spellchecker.py | 17 +---------------- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/bin/virtaal b/bin/virtaal index ad5f9a2d..f7ecd83e 100755 --- a/bin/virtaal +++ b/bin/virtaal @@ -185,12 +185,6 @@ def main(argv): parser.error(_("Could not open profile file '%(filename)s'") % {"filename":options.profile}) def default_runner(startup_file): - if not pan_app.DEBUG: - try: - import psyco - psyco.full() - except Exception: - pass run_virtaal(startup_file) if options and getattr(options, "profile", None) != None: diff --git a/docs/building.rst b/docs/building.rst index dfe0ae82..3be35f32 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -38,7 +38,6 @@ Optional Packages These are not build dependencies but usually improve the user experience. -- psyco -- provides a nice speedup - Enchant, pyenchant, gtkspell and pygtkspell (might be packaged as gnome-python-extras or something similar) -- provides all :doc:`spell checking ` functionality. For Windows: diff --git a/setup.py b/setup.py index 5de52a71..ec34d6f9 100755 --- a/setup.py +++ b/setup.py @@ -482,7 +482,7 @@ def add_win32_options(options): "dist_dir": "virtaal-win32", "includes": [ # some of these are needed by plugins and are therefore not detected - "lxml", "lxml._elementpath", "psyco", "cairo", "pango", + "lxml", "lxml._elementpath", "cairo", "pango", "pangocairo", "atk", "gobject", "gtk.keysyms", "gtkspell", "gio", # needed for gtk.Builder @@ -533,7 +533,7 @@ def add_mac_options(options): "options": { "py2app": { "packages": ["CoreFoundation", "objc"], - "includes": ["lxml", "lxml._elementpath", "lxml.etree", "glib", "gio", "psyco", "cairo", "pango", "pangocairo", "atk", "gobject", "gtk.keysyms", "pycurl", "translate.services", "translate.services.tmclient", "translate.services.opentranclient", "CoreFoundation"], + "includes": ["lxml", "lxml._elementpath", "lxml.etree", "glib", "gio", "cairo", "pango", "pangocairo", "atk", "gobject", "gtk.keysyms", "pycurl", "translate.services", "translate.services.tmclient", "translate.services.opentranclient", "CoreFoundation"], #"semi_standalone": True, "compressed": True, "argv_emulation": True, diff --git a/virtaal/plugins/spellchecker.py b/virtaal/plugins/spellchecker.py index 868f19c3..8f1f806b 100644 --- a/virtaal/plugins/spellchecker.py +++ b/virtaal/plugins/spellchecker.py @@ -29,14 +29,6 @@ from virtaal.common import pan_app from virtaal.controllers.baseplugin import PluginUnsupported, BasePlugin -if not pan_app.DEBUG: - try: - import psyco - except: - psyco = None -else: - psyco = None - _dict_add_re = re.compile('Add "(.*)" to Dictionary') @@ -243,8 +235,6 @@ def _disable_checking(self, text_view): if not spell is None: spell.detach() text_view.spell_lang = None - if psyco: - psyco.cannotcompile(_disable_checking) # SIGNAL HANDLERS # @@ -298,8 +288,7 @@ def _on_unit_lang_changed(self, unit_view, text_view, language): gobject.idle_add(self._activate_checker, text_view, language, priority=gobject.PRIORITY_LOW) def _activate_checker(self, text_view, language): - # All the expensive stuff in here called on idle. We mush also isolate - # this away from psyco + # All the expensive stuff in here called on idle try: spell = None try: @@ -319,10 +308,6 @@ def _activate_checker(self, text_view, language): logging.exception("Could not initialize spell checking: %s", e) self.gtkspell = None #TODO: unload plugin - if psyco: - # Some of the gtkspell stuff can't work with psyco and will dump core - # if we don't avoid psyco compilation - psyco.cannotcompile(_activate_checker) def _on_populate_popup(self, textbox, menu): # We can't work with the menu immediately, since gtkspell only adds its