Mercurial Repositories > eric / changeset

--- a/Graphics/ApplicationDiagram.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Graphics/ApplicationDiagram.py	Thu Jan 07 12:31:11 2010 +0000
@@ -62,7 +62,7 @@
         try:
             prog = 0
             progress = QProgressDialog(self.trUtf8("Parsing modules..."),
-                "", 0, tot, self)
+                None, 0, tot, self)
             progress.show()
             QApplication.processEvents()
             for module in modules:

--- a/Graphics/ImportsDiagram.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Graphics/ImportsDiagram.py	Thu Jan 07 12:31:11 2010 +0000
@@ -74,7 +74,7 @@
         try:
             prog = 0
             progress = QProgressDialog(self.trUtf8("Parsing modules..."),
-                "", 0, tot, self)
+                None, 0, tot, self)
             progress.show()
             QApplication.processEvents()
             for module in modules:

--- a/Graphics/PackageDiagram.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Graphics/PackageDiagram.py	Thu Jan 07 12:31:11 2010 +0000
@@ -73,7 +73,7 @@
         try:
             prog = 0
             progress = QProgressDialog(self.trUtf8("Parsing modules..."),
-                "", 0, tot, self)
+                None, 0, tot, self)
             progress.show()
             QApplication.processEvents()
             for module in modules:

--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Thu Jan 07 12:31:11 2010 +0000
@@ -77,11 +77,13 @@
         if isinstance(fn, list):
             files = fn
         elif os.path.isdir(fn):
+            # TODO: make this dependant on configured extensions
             files = Utilities.direntries(fn, 1, '*.py', 0)
             files += Utilities.direntries(fn, 1, '*.pyw', 0)
             files += Utilities.direntries(fn, 1, '*.ptl', 0)
         else:
             files = [fn]
+        # TODO: make this dependant on configured extensions
         files = [f for f in files \
                     if f.endswith(".py") or f.endswith(".pyw") or f.endswith(".ptl")]
         

--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Thu Jan 07 12:31:11 2010 +0000
@@ -71,11 +71,13 @@
         if isinstance(fn, list):
             files = fn
         elif os.path.isdir(fn):
+            # TODO: make this dependant on configured extensions
             files = Utilities.direntries(fn, 1, '*.py', 0)
             files += Utilities.direntries(fn, 1, '*.pyw', 0)
             files += Utilities.direntries(fn, 1, '*.ptl', 0)
         else:
             files = [fn]
+        # TODO: make this dependant on configured extensions
         files = [f for f in files \
                     if f.endswith(".py") or f.endswith(".pyw") or f.endswith(".ptl")]
         

--- a/Plugins/PluginSyntaxChecker.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Plugins/PluginSyntaxChecker.py	Thu Jan 07 12:31:11 2010 +0000
@@ -146,7 +146,7 @@
         """
         if menuName == "Checks" and self.__projectAct is not None:
             self.__projectAct.setEnabled(\
-                e4App().getObject("Project").getProjectLanguage() == "Python")
+                e4App().getObject("Project").getProjectLanguage() == "Python3")
     
     def __projectBrowserShowMenu(self, menuName, menu):
         """
@@ -178,6 +178,7 @@
         """
         project = e4App().getObject("Project")
         project.saveAllScripts()
+        # TODO: make this dependant on configured extensions
         files = [os.path.join(project.ppath, file) \
             for file in project.pdata["SOURCES"] \
                 if file.endswith(".py") or \

--- a/Plugins/PluginTabnanny.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Plugins/PluginTabnanny.py	Thu Jan 07 12:31:11 2010 +0000
@@ -147,7 +147,7 @@
         """
         if menuName == "Checks" and self.__projectAct is not None:
             self.__projectAct.setEnabled(\
-                e4App().getObject("Project").getProjectLanguage() == "Python")
+                e4App().getObject("Project").getProjectLanguage() == "Python3")
     
     def __projectBrowserShowMenu(self, menuName, menu):
         """
@@ -180,6 +180,7 @@
         """
         project = e4App().getObject("Project")
         project.saveAllScripts()
+        # TODO: make this dependant on configured extensions
         files = [os.path.join(project.ppath, file) \
             for file in project.pdata["SOURCES"] \
                 if file.endswith(".py") or \

--- a/Project/ProjectFormsBrowser.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Project/ProjectFormsBrowser.py	Thu Jan 07 12:31:11 2010 +0000
@@ -830,7 +830,7 @@
                 return
             
             progress = QProgressDialog(self.trUtf8("Determining changed forms..."), 
-                "", 0, 100)
+                None, 0, 100)
             progress.setMinimumDuration(0)
             i = 0
             
@@ -908,4 +908,4 @@
             "compileSelectedForms"  : None, 
             "generateDialogCode"    : None, 
             "newForm"               : None, 
-        }
\ No newline at end of file
+        }

--- a/Project/ProjectResourcesBrowser.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Project/ProjectResourcesBrowser.py	Thu Jan 07 12:31:11 2010 +0000
@@ -733,7 +733,7 @@
             self.hooks["compileChangedResources"](self.project.pdata["RESOURCES"])
         else:
             progress = QProgressDialog(self.trUtf8("Determining changed resources..."), 
-                "", 0, 100)
+                None, 0, 100)
             progress.setMinimumDuration(0)
             i = 0
             
@@ -815,4 +815,4 @@
             "compileChangedResources"   : None, 
             "compileSelectedResources"  : None, 
             "newResource"               : None, 
-        }
\ No newline at end of file
+        }

--- a/Utilities/__init__.py	Thu Jan 07 12:30:38 2010 +0000
+++ b/Utilities/__init__.py	Thu Jan 07 12:31:11 2010 +0000
@@ -887,7 +887,8 @@
     if not codestring:
         try:
             f = open(file)
-            codestring, encoding = decode(f.read())
+##            codestring, encoding = decode(f.read())
+            codestring = f.read()
             f.close()
         except IOError:
             return (False, None, None, None, None)
@@ -1225,4 +1226,4 @@
             u = getEnvironmentEntry('USERNAME')
         except KeyError:
             u = getEnvironmentEntry('username', None)
-        return u
\ No newline at end of file
+        return u