Mercurial Repositories > eric / file diff

--- a/Utilities/py3flakes/messages.py	Tue Jan 14 19:51:24 2014 +0100
+++ b/Utilities/py3flakes/messages.py	Wed Jan 15 18:59:03 2014 +0100
@@ -11,13 +11,12 @@
 Module implementing the messages for py3flakes.
 """
 
-from PyQt4.QtCore import QCoreApplication
-
 
 class Message(object):
     """
     Class defining the base for all specific message classes.
     """
+    message_id = 'F00'
     message = ''
     message_args = ()
     
@@ -37,28 +36,25 @@
         
         @return string representation of the object (string)
         """
-        return '{0}:{1} {2}'.format(
-            self.filename, self.lineno,
-            self.message.format(*self.message_args))
+        return '%s:%s: %s' % (
+            self.filename, self.lineno, self.message % self.message_args)
     
     def getMessageData(self):
         """
         Public method to get the individual message data elements.
         
-        @return tuple containing file name, line number and message
-            (string, integer, string)
+        @return tuple containing file name, line number, message ID and
+            message arguments (string, integer, string, list)
         """
-        return (self.filename, self.lineno,
-                self.message.format(*self.message_args))
+        return (self.filename, self.lineno, self.message_id, self.message_args)
 
 
 class UnusedImport(Message):
     """
     Class defining the "Unused Import" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        '{0!r} imported but unused.')
+    message_id = 'F01'
+    message = '%r imported but unused'
     
     def __init__(self, filename, lineno, name):
         """
@@ -76,9 +72,8 @@
     """
     Class defining the "Redefined While Unused" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Redefinition of unused {0!r} from line {1!r}.')
+    message_id = 'F02'
+    message = 'redefinition of unused %r from line %r'
     
     def __init__(self, filename, lineno, name, orig_lineno):
         """
@@ -97,9 +92,8 @@
     """
     Class defining the "Import Shadowed By Loop Var" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Import {0!r} from line {1!r} shadowed by loop variable.')
+    message_id = 'F03'
+    message = 'import %r from line %r shadowed by loop variable'
     
     def __init__(self, filename, lineno, name, orig_lineno):
         """
@@ -118,9 +112,8 @@
     """
     Class defining the "Import Star Used" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        "'from {0} import *' used; unable to detect undefined names.")
+    message_id = 'F04'
+    message = "'from %s import *' used; unable to detect undefined names"
     
     def __init__(self, filename, lineno, modname):
         """
@@ -138,7 +131,8 @@
     """
     Class defining the "Undefined Name" message.
     """
-    message = QCoreApplication.translate('py3Flakes', 'Undefined name {0!r}.')
+    message_id = 'F05'
+    message = 'undefined name %r'
     
     def __init__(self, filename, lineno, name):
         """
@@ -156,8 +150,8 @@
     """
     Class defining the "Undefined Export" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes', 'Undefined name {0!r} in __all__.')
+    message_id = 'F06'
+    message = 'undefined name %r in __all__'
     
     def __init__(self, filename, lineno, name):
         """
@@ -175,10 +169,9 @@
     """
     Class defining the "Undefined Local Variable" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        "Local variable {0!r} (defined in enclosing scope on line {1!r})"
-        " referenced before assignment.")
+    message_id = 'F07'
+    message = "local variable %r (defined in enclosing scope on line %r)" \
+              " referenced before assignment"
     
     def __init__(self, filename, lineno, name, orig_lineno):
         """
@@ -197,9 +190,8 @@
     """
     Class defining the "Duplicate Argument" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Duplicate argument {0!r} in function definition.')
+    message_id = 'F08'
+    message = 'duplicate argument %r in function definition'
     
     def __init__(self, filename, lineno, name):
         """
@@ -217,9 +209,8 @@
     """
     Class defining the "Redefined Function" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Redefinition of function {0!r} from line {1!r}.')
+    message_id = 'F09'
+    message = 'redefinition of function %r from line %r'
     
     def __init__(self, filename, lineno, name, orig_lineno):
         """
@@ -238,9 +229,8 @@
     """
     Class defining the "Late Future Import" message.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Future import(s) {0!r} after other statements.')
+    message_id = 'F10'
+    message = 'future import(s) %r after other statements'
     
     def __init__(self, filename, lineno, names):
         """
@@ -261,9 +251,8 @@
     Indicates that a variable has been explicitly assigned to but not actually
     used.
     """
-    message = QCoreApplication.translate(
-        'py3Flakes',
-        'Local variable {0!r} is assigned to but never used.')
+    message_id = 'F11'
+    message = 'local variable %r is assigned to but never used'
     
     def __init__(self, filename, lineno, name):
         """