[pypy-svn] r25514 - in pypy/dist/pypy: interpreter interpreter/astcompiler tool

[ac at codespeak.net]

Author: ac
Date: Fri Apr  7 19:03:47 2006
New Revision: 25514

Added:
   pypy/dist/pypy/tool/stdlib___future__.py
      - copied unchanged from r25373, pypy/dist/pypy/tool/__future__.py
   pypy/dist/pypy/tool/stdlib_opcode.py
      - copied unchanged from r25373, pypy/dist/pypy/tool/opcode.py
Removed:
   pypy/dist/pypy/tool/__future__.py
   pypy/dist/pypy/tool/opcode.py
Modified:
   pypy/dist/pypy/interpreter/astcompiler/pyassem.py
   pypy/dist/pypy/interpreter/pycompiler.py
   pypy/dist/pypy/interpreter/pyopcode.py
Log:
Move pypy/tool/{__future__,opcode}.py to pypy/tool/stdlib_{__future__,opcode}.py to avoid nameclashes.

Modified: pypy/dist/pypy/interpreter/astcompiler/pyassem.py
==============================================================================
--- pypy/dist/pypy/interpreter/astcompiler/pyassem.py	(original)
+++ pypy/dist/pypy/interpreter/astcompiler/pyassem.py	Fri Apr  7 19:03:47 2006
@@ -7,7 +7,7 @@
      import CO_OPTIMIZED, CO_NEWLOCALS, CO_VARARGS, CO_VARKEYWORDS
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.baseobjspace import W_Root
-from pypy.tool import opcode as pythonopcode
+from pypy.tool import stdlib_opcode as pythonopcode
 
 class BlockSet:
     """A Set implementation specific to Blocks

Modified: pypy/dist/pypy/interpreter/pycompiler.py
==============================================================================
--- pypy/dist/pypy/interpreter/pycompiler.py	(original)
+++ pypy/dist/pypy/interpreter/pycompiler.py	Fri Apr  7 19:03:47 2006
@@ -78,11 +78,11 @@
 # faked compiler
 
 import warnings
-from pypy.tool import __future__
+from pypy.tool import stdlib___future__
 compiler_flags = 0
 compiler_features = {}
-for fname in __future__.all_feature_names:
-    flag = getattr(__future__, fname).compiler_flag
+for fname in stdlib___future__.all_feature_names:
+    flag = getattr(stdlib___future__, fname).compiler_flag
     compiler_flags |= flag
     compiler_features[fname] = flag
 allowed_flags = compiler_flags | PyCF_DONT_IMPLY_DEDENT
@@ -113,7 +113,7 @@
     """Faked implementation of a compiler, using the underlying compile()."""
 
     def compile(self, source, filename, mode, flags):
-        flags |= __future__.generators.compiler_flag   # always on (2.2 compat)
+        flags |= stdlib___future__.generators.compiler_flag   # always on (2.2 compat)
         space = self.space
         try:
             old = self.setup_warn_explicit(warnings)
@@ -208,7 +208,7 @@
         from pyparser.pythonutil import AstBuilder, PYTHON_PARSER, TARGET_DICT
         from pypy.interpreter.pycode import PyCode
 
-        flags |= __future__.generators.compiler_flag   # always on (2.2 compat)
+        flags |= stdlib___future__.generators.compiler_flag   # always on (2.2 compat)
         space = self.space
         try:
             builder = AstBuilder(space=space)

Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py	(original)
+++ pypy/dist/pypy/interpreter/pyopcode.py	Fri Apr  7 19:03:47 2006
@@ -14,7 +14,7 @@
 from pypy.tool.sourcetools import func_with_new_name
 from pypy.rpython.objectmodel import we_are_translated
 from pypy.rpython.rarithmetic import intmask
-from pypy.tool import opcode as pythonopcode
+from pypy.tool import stdlib_opcode as pythonopcode
 
 def unaryoperation(operationname):
     """NOT_RPYTHON"""