Mercurial Repositories > Django Project / changeset

diff -r e8909f38e9db -r 19da3417eb3d ChangeLog
--- a/ChangeLog	Sat Apr 12 19:35:40 2014 +0200
+++ b/ChangeLog	Sat Apr 26 16:56:48 2014 +0200
@@ -1,6 +1,8 @@
 ChangeLog
 ---------
----------
+Version 3.4.0:
+- added the Python2 compatibility flag
+
 Version 3.3.6:
 - bug fixes
 

diff -r e8909f38e9db -r 19da3417eb3d PluginProjectDjango.py
--- a/PluginProjectDjango.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/PluginProjectDjango.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,7 +7,7 @@
 Module implementing the Django project plugin.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 
 import os
 import glob
@@ -28,7 +28,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "3.3.6"
+version = "3.4.0"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."
@@ -36,6 +36,7 @@
     """This plugin implements project support for Django projects."""
 needsRestart = False
 pyqtApi = 2
+python2Compatible = True
 # End-of-Header
 
 error = ""

diff -r e8909f38e9db -r 19da3417eb3d PluginProjectDjango.zip
Binary file PluginProjectDjango.zip has changed

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/ConfigurationPage/DjangoPage.py
--- a/ProjectDjango/ConfigurationPage/DjangoPage.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,7 +7,7 @@
 Module implementing the Django configuration page.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 
 from PyQt4.QtCore import pyqtSlot
 

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/DjangoDialog.py
--- a/ProjectDjango/DjangoDialog.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/DjangoDialog.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,10 +7,10 @@
 Module implementing a dialog starting a process and showing its output.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode    # __IGNORE_WARNING__
-except (NameError):
+except NameError:
     pass
 
 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/DjangoDumpdataDataDialog.py
--- a/ProjectDjango/DjangoDumpdataDataDialog.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/DjangoDumpdataDataDialog.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for the 'dumpdata' command.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 
 from PyQt4.QtGui import QDialog
 

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/DjangoLoaddataDataDialog.py
--- a/ProjectDjango/DjangoLoaddataDataDialog.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/DjangoLoaddataDataDialog.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for the 'loaddata' command.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 
 from PyQt4.QtCore import pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/Documentation/source/Plugin_Project_Django.PluginProjectDjango.html
--- a/ProjectDjango/Documentation/source/Plugin_Project_Django.PluginProjectDjango.html	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/Documentation/source/Plugin_Project_Django.PluginProjectDjango.html	Sat Apr 26 16:56:48 2014 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>djangoPluginObject</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr>
+<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>djangoPluginObject</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>python2Compatible</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr>
 </table>
 <h3>Classes</h3>
 <table>

diff -r e8909f38e9db -r 19da3417eb3d ProjectDjango/Project.py
--- a/ProjectDjango/Project.py	Sat Apr 12 19:35:40 2014 +0200
+++ b/ProjectDjango/Project.py	Sat Apr 26 16:56:48 2014 +0200
@@ -7,10 +7,10 @@
 Module implementing the Django project support.
 """
 
-from __future__ import unicode_literals    # __IGNORE_WARNING__
+from __future__ import unicode_literals
 try:
     str = unicode    # __IGNORE_WARNING__
-except (NameError):
+except NameError:
     pass
 
 import sys