Merge lp:~wbond/pymeta/python3 into lp:pymeta

[Will Bond]

I am working on getting pybars working on Python 3.3, and pymeta is a dependency of that.

This patch keeps all of the unit tests functioning the same with Python 2. Unfortunately from what I can tell, the twisted.trial package is not compatible with Python 3 yet.

That said, with these changes, all of the unit tests of pybars run successfully in Python 3.

Unmerged revisions

67. By Will Bond on 2013-03-17

Updated code to run on Python 3 also

=== modified file 'examples/html.py'
--- examples/html.py	2008-04-17 13:38:56 +0000
+++ examples/html.py	2013-03-17 18:51:21 +0000
@@ -29,7 +29,7 @@
     """
     Format a dictionary as HTML-ish attributes.
     """
-    return ''.join([" %s='%s'" % (k, v) for (k, v) in attrs.iteritems()])
+    return ''.join([" %s='%s'" % (k, v) for (k, v) in attrs.items()])
 
 
 unparserGrammar = """
 
=== modified file 'examples/terml/parser.py'
--- examples/terml/parser.py	2010-05-13 06:26:31 +0000
+++ examples/terml/parser.py	2013-03-17 18:51:21 +0000
@@ -152,9 +152,14 @@
     return _Term(functor, argList)
 
 def numberType(n):
+    try:
+        int_types = (long, int)
+    except NameError:
+        int_types = (int,)
+        
     if isinstance(n, float):
         return ".float64."
-    elif isinstance(n, (long, int)):
+    elif isinstance(n, int_types):
         return ".int."
     raise ValueError("wtf")
 
@@ -200,6 +205,6 @@
     
     try:
         return _parseTerm(termString)
-    except ParseError, e:
-        print e.formatError(termString)
+    except ParseError as e:
+        print(e.formatError(termString))
         raise
 
=== modified file 'examples/terml/test_terml.py'
--- examples/terml/test_terml.py	2010-05-13 06:26:31 +0000
+++ examples/terml/test_terml.py	2013-03-17 18:51:21 +0000
@@ -24,7 +24,7 @@
         self.assertEqual(parse('"foo bar"'), TermLiteral('.String.', "foo bar"))
         self.assertEqual(parse("'x'"), TermLiteral('.char', character('x')))
         self.assertEqual(parse("0xDECAFC0FFEEBAD"), TermLiteral('.int.', 0xDECAFC0FFEEBAD))
-        self.assertEqual(parse("0755"), TermLiteral('.int.', 0755))
+        self.assertEqual(parse("0755"), TermLiteral('.int.', 0o755))
         self.assertEqual(parse("3.14159E17"), TermLiteral('.float64.', 3.14159E17))
         self.assertEqual(parse("1e9"), TermLiteral('.float64.', 1e9))
         self.assertEqual(parse("0"), TermLiteral(".int.", 0))
 
=== modified file 'pymeta/boot.py'
--- pymeta/boot.py	2010-06-11 06:56:34 +0000
+++ pymeta/boot.py	2013-03-17 18:51:21 +0000
@@ -79,10 +79,11 @@
         Consume input until a non-whitespace character is reached.
         """
         consumingComment = False
+        e = None
         while True:
             try:
                 c, e = self.input.head()
-            except EOFError, e:
+            except EOFError:
                 break
             t = self.input.tail()
             if c.isspace() or consumingComment:
 
=== modified file 'pymeta/grammar.py'
--- pymeta/grammar.py	2010-06-06 16:46:35 +0000
+++ pymeta/grammar.py	2013-03-17 18:51:21 +0000
@@ -4,9 +4,9 @@
 definitions.
 """
 import string
-from builder import TreeBuilder, moduleFromGrammar
-from boot import BootOMetaGrammar
-from runtime import OMetaBase, ParseError, EOFError
+from .builder import TreeBuilder, moduleFromGrammar
+from .boot import BootOMetaGrammar
+from .runtime import OMetaBase, ParseError, EOFError
 
 class OMeta(OMetaBase):
     """
@@ -264,10 +264,11 @@
         Consume input until a non-whitespace character is reached.
         """
         consumingComment = False
+        e = None
         while True:
             try:
                 c, e = self.input.head()
-            except EOFError, e:
+            except EOFError:
                 break
             t = self.input.tail()
             if c.isspace() or consumingComment:
 
=== modified file 'pymeta/runtime.py'
--- pymeta/runtime.py	2010-06-11 06:56:34 +0000
+++ pymeta/runtime.py	2013-03-17 18:51:21 +0000
@@ -21,6 +21,9 @@
         if len(a) > 2:
             self.message = a[2]
 
+    def __getitem__(self, item):
+        return self.args[item]
+
     def __eq__(self, other):
         if other.__class__ == self.__class__:
             return (self.position, self.error) == (other.position, other.error)
@@ -91,7 +94,12 @@
     """
     Return the error from the branch that matched the most of the input.
     """
-    errors.sort(reverse=True, key=operator.itemgetter(0))
+    def get_key(item):
+        val = item[0]
+        if val == None:
+            val = -1000000000
+        return val
+    errors.sort(reverse=True, key=get_key)
     results = set()
     pos = errors[0][0]
     for err in errors:
@@ -118,16 +126,20 @@
         """
         raise TypeError("Characters are not iterable")
 
-class unicodeCharacter(unicode):
-    """
-    Type to distinguish characters from Unicode strings.
-    """
-    def __iter__(self):
-        """
-        Prevent string patterns and list patterns from matching single
-        characters.
-        """
-        raise TypeError("Characters are not iterable")
+try:
+    _has_unicode = True
+    class unicodeCharacter(unicode):
+        """
+        Type to distinguish characters from Unicode strings.
+        """
+        def __iter__(self):
+            """
+            Prevent string patterns and list patterns from matching single
+            characters.
+            """
+            raise TypeError("Characters are not iterable")
+except NameError:
+    _has_unicode = False
 
 class InputStream(object):
     """
@@ -140,7 +152,7 @@
         """
         if isinstance(iterable, str):
             data = [character(c) for c in iterable]
-        elif isinstance(iterable, unicode):
+        elif _has_unicode and isinstance(iterable, unicode):
             data = [unicodeCharacter(c) for c in iterable]
         else:
             data = list(iterable)
@@ -299,7 +311,7 @@
         @param args: A sequence of arguments to it.
         """
         if args:
-            if rule.func_code.co_argcount - 1 != len(args):
+            if rule.__code__.co_argcount - 1 != len(args):
                 for arg in args[::-1]:
                     self.input = ArgInput(arg, self.input)
                 return rule()
@@ -375,6 +387,7 @@
         @param initial: Initial values to populate the returned list with.
         """
         ans = []
+        e = None
         for x, e in initial:
             ans.append(x)
         while True:
@@ -382,7 +395,7 @@
                 m = self.input
                 v, _ = fn()
                 ans.append(v)
-            except ParseError, e:
+            except ParseError:
                 self.input = m
                 break
         return ans, e
@@ -401,7 +414,7 @@
                 ret, err = f()
                 errors.append(err)
                 return ret, joinErrors(errors)
-            except ParseError, e:
+            except ParseError as e:
                 errors.append(e)
                 self.input = m
         raise ParseError(*joinErrors(errors))
@@ -416,7 +429,7 @@
         m = self.input
         try:
             fn()
-        except ParseError, e:
+        except ParseError as e:
             self.input = m
             return True, self.input.nullError()
         else:
@@ -429,7 +442,7 @@
         while True:
             try:
                 c, e = self.input.head()
-            except EOFError, e:
+            except EOFError as e:
                 break
             t = self.input.tail()
             if c.isspace():
@@ -506,7 +519,7 @@
             for c in tok:
                 v, e = self.exactly(c)
             return tok, e
-        except ParseError, e:
+        except ParseError as e:
             self.input = m
             
             raise ParseError(e[0], expected("token", tok))
@@ -567,7 +580,7 @@
         while True:
             try:
                 c, e = self.rule_anything()
-            except ParseError, e:
+            except ParseError as e:
                 endchar = None
                 break
             if c in endChars and len(stack) == 0:
@@ -579,7 +592,7 @@
                     stack.append(delimiters[c])
                 elif len(stack) > 0 and c == stack[-1]:
                     stack.pop()
-                elif c in delimiters.values():
+                elif c in list(delimiters.values()):
                     raise ParseError(self.input.position, expected("Python expression"))
                 elif c in "\"'":
                     while True:
 
=== modified file 'pymeta/test/test_pymeta.py'
--- pymeta/test/test_pymeta.py	2010-06-11 06:56:34 +0000
+++ pymeta/test/test_pymeta.py	2013-03-17 18:51:21 +0000
@@ -94,7 +94,7 @@
         Input matches can be made on literal integers.
         """
         g = self.compile("stuff ::= 17 0x1F -2 0177")
-        self.assertEqual(g.stuff([17, 0x1f, -2, 0177]), 0177)
+        self.assertEqual(g.stuff([17, 0x1f, -2, 0o177]), 0o177)
         self.assertRaises(ParseError, g.stuff, [1, 2, 3])
 
 
@@ -357,7 +357,11 @@
                   | :x ?(isinstance(x, basestring) and x.isdigit()) => int(x))
         """)
         self.assertEqual(g.interp([['3', '+', ['5', '*', '2']]]), 13)
-        self.assertEqual(g.interp([[u'3', u'+', [u'5', u'*', u'2']]]), 13)
+        try:
+            self.assertEqual(g.interp([[u'3', u'+', [u'5', u'*', u'2']]]), 13)
+        except SyntaxError:
+            # Python 3.0-3.2
+            pass
 
 
     def test_string(self):
@@ -462,7 +466,7 @@
         Input matches can be made on literal integers.
         """
         g = self.compile("stuff = 17 0x1F -2 0177")
-        self.assertEqual(g.stuff([17, 0x1f, -2, 0177]), 0177)
+        self.assertEqual(g.stuff([17, 0x1f, -2, 0o177]), 0o177)
         self.assertRaises(ParseError, g.stuff, [1, 2, 3])
 
 
@@ -708,7 +712,11 @@
                   | :x ?(isinstance(x, basestring) and x.isdigit()) -> int(x))
         """)
         self.assertEqual(g.interp([['3', '+', ['5', '*', '2']]]), 13)
-        self.assertEqual(g.interp([[u'3', u'+', [u'5', u'*', u'2']]]), 13)
+        try:
+            self.assertEqual(g.interp([['3', '+', ['5', '*', '2']]]), 13)
+        except SyntaxError:
+            # Python 3.0-3.2
+            pass
 
 
     def test_string(self):