[pypy-svn] r10349 - in pypy/dist/pypy: objspace objspace/flow tool translator translator/genc

[sanxiyn at codespeak.net]

Author: sanxiyn
Date: Tue Apr  5 20:53:05 2005
New Revision: 10349

Modified:
   pypy/dist/pypy/objspace/flow/specialcase.py
   pypy/dist/pypy/objspace/trace.py
   pypy/dist/pypy/tool/traceop.py
   pypy/dist/pypy/translator/genc/t_pyobj.py
   pypy/dist/pypy/translator/geninterplevel.py
   pypy/dist/pypy/translator/transform.py
Log:
2.2 compatibilities.


Modified: pypy/dist/pypy/objspace/flow/specialcase.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/specialcase.py	(original)
+++ pypy/dist/pypy/objspace/flow/specialcase.py	Tue Apr  5 20:53:05 2005
@@ -26,5 +26,5 @@
     # space.specialcases[fn] = sc_normalize_exception
     if space.do_imports_immediately:
         space.specialcases[__import__] = sc_import
-    for opname in ['lt', 'le', 'eq', 'ne', 'gt', 'ge', 'is_']:
+    for opname in ['lt', 'le', 'eq', 'ne', 'gt', 'ge']:
         space.specialcases[getattr(operator, opname)] = sc_operator

Modified: pypy/dist/pypy/objspace/trace.py
==============================================================================
--- pypy/dist/pypy/objspace/trace.py	(original)
+++ pypy/dist/pypy/objspace/trace.py	Tue Apr  5 20:53:05 2005
@@ -165,7 +165,8 @@
 
     # Remove list
     for name in ["wrap", "unwrap"]:
-        operations.pop(name, None)
+        if name in operations:
+            del operations[name]
     return operations
 
 def create_trace_space(space = None, operations = None):    

Modified: pypy/dist/pypy/tool/traceop.py
==============================================================================
--- pypy/dist/pypy/tool/traceop.py	(original)
+++ pypy/dist/pypy/tool/traceop.py	Tue Apr  5 20:53:05 2005
@@ -1,6 +1,12 @@
+from __future__ import generators
 
 import autopath
 
+def reversed(seq):
+    length = len(seq)
+    for index in range(length-1, -1, -1):
+        yield seq[index]
+
 class Stack(list):
     push = list.append
 
@@ -147,7 +153,7 @@
             self.indent_state.pop()                
 
     def get_last_frame(self):
-        for c, t, f in self.indent_state[::-1]:
+        for c, t, f in reversed(self.indent_state):
             if f is not None:
                 return f
             

Modified: pypy/dist/pypy/translator/genc/t_pyobj.py
==============================================================================
--- pypy/dist/pypy/translator/genc/t_pyobj.py	(original)
+++ pypy/dist/pypy/translator/genc/t_pyobj.py	Tue Apr  5 20:53:05 2005
@@ -433,6 +433,8 @@
         source = """if 1:
             import zlib, marshal
             exec marshal.loads(zlib.decompress(%r))""" % small
+        # Python 2.2 SyntaxError without newline: Bug #501622
+        source += '\n'
         co = compile(source, self.genc.modname, 'exec')
         del source
         return marshal.dumps(co)

Modified: pypy/dist/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/dist/pypy/translator/geninterplevel.py	(original)
+++ pypy/dist/pypy/translator/geninterplevel.py	Tue Apr  5 20:53:05 2005
@@ -568,7 +568,6 @@
 
     def nameof_classobj(self, cls):
         printable_name = cls.__name__
-        gaga = "ssertion" in printable_name
         if cls.__doc__ and cls.__doc__.lstrip().startswith('NOT_RPYTHON'):
             #raise Exception, "%r should never be reached" % (cls,)
             print "skipped class", printable_name
@@ -591,11 +590,6 @@
             # metaclass = 'space.w_classobj'
 
         basenames = [self.nameof(base) for base in cls.__bases__]
-        if gaga:
-            print cls
-            print cls.__module__
-            print type(cls)
-            1/0
         def initclassobj():
             content = cls.__dict__.items()
             content.sort()
@@ -1480,7 +1474,6 @@
     # and now use the members of the dict
     """
     # create something like a module
-    if "_formatting" in sourcetext: tmpname="/tmp/look.py"
     if filename is None: 
         code = py.code.Source(sourcetext).compile()
     else: 

Modified: pypy/dist/pypy/translator/transform.py
==============================================================================
--- pypy/dist/pypy/translator/transform.py	(original)
+++ pypy/dist/pypy/translator/transform.py	Tue Apr  5 20:53:05 2005
@@ -5,6 +5,8 @@
 completed.
 """
 
+from __future__ import generators
+
 import types
 from pypy.objspace.flow.model import SpaceOperation
 from pypy.objspace.flow.model import Variable, Constant, Block, Link