Mon, 26 Aug 2013 19:56:11 +0200
Merged with changes from Tobias.
--- a/AssistantEric/APIsManager.py Mon Aug 19 15:04:01 2013 +0200 +++ b/AssistantEric/APIsManager.py Mon Aug 26 19:56:11 2013 +0200 @@ -7,6 +7,8 @@ Module implementing the APIsManager. """ +from __future__ import unicode_literals # __IGNORE_WARNING__ + import os from PyQt4.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, QObject, Qt
--- a/AssistantEric/Assistant.py Mon Aug 19 15:04:01 2013 +0200 +++ b/AssistantEric/Assistant.py Mon Aug 26 19:56:11 2013 +0200 @@ -8,6 +8,8 @@ calltips system. """ +from __future__ import unicode_literals # __IGNORE_WARNING__ + import re import imp
--- a/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py Mon Aug 19 15:04:01 2013 +0200 +++ b/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py Mon Aug 26 19:56:11 2013 +0200 @@ -7,6 +7,8 @@ Module implementing the Eric Autocompletion configuration page. """ +from __future__ import unicode_literals # __IGNORE_WARNING__ + from AssistantEric.Assistant import AcsAPIs, AcsDocument, AcsProject from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
--- a/AssistantEric/ConfigurationPages/CallTipsEricPage.py Mon Aug 19 15:04:01 2013 +0200 +++ b/AssistantEric/ConfigurationPages/CallTipsEricPage.py Mon Aug 26 19:56:11 2013 +0200 @@ -7,6 +7,8 @@ Module implementing the Eric Calltips configuration page. """ +from __future__ import unicode_literals # __IGNORE_WARNING__ + from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_CallTipsEricPage import Ui_CallTipsEricPage
--- a/ChangeLog Mon Aug 19 15:04:01 2013 +0200 +++ b/ChangeLog Mon Aug 26 19:56:11 2013 +0200 @@ -3,6 +3,8 @@ Version 2.6.0: - bug fixes - enhanced reaction upon changes of a project (eric 5.4.x required) +- Python 2 compatibility for Eric 5 + Version 2.5.0: - bug fixes
--- a/PluginAssistantEric.py Mon Aug 19 15:04:01 2013 +0200 +++ b/PluginAssistantEric.py Mon Aug 26 19:56:11 2013 +0200 @@ -7,6 +7,8 @@ Module implementing the Eric assistant plugin. """ +from __future__ import unicode_literals # __IGNORE_WARNING__ + import os from PyQt4.QtCore import QObject, QTranslator
--- a/PluginEricAssistant.e4p Mon Aug 19 15:04:01 2013 +0200 +++ b/PluginEricAssistant.e4p Mon Aug 26 19:56:11 2013 +0200 @@ -7,7 +7,7 @@ <ProgLanguage mixed="0">Python3</ProgLanguage> <ProjectType>E4Plugin</ProjectType> <Description>Plugin implementing an alternative autocompletion and calltips provider.</Description> - <Version>2.5.x</Version> + <Version>2.6.x</Version> <Author>Detlev Offenbach</Author> <Email>detlev@die-offenbachs.de</Email> <TranslationPattern>AssistantEric/i18n/assistant_%language%.ts</TranslationPattern>