[pypy-svn] r5057 - in pypy/trunk/src/pypy: annotation interpreter module objspace objspace/flow objspace/flow/test objspace/std tool
mwh at codespeak.net
mwh at codespeak.net
Fri Jun 11 15:49:12 CEST 2004
Author: mwh
Date: Fri Jun 11 15:49:11 2004
New Revision: 5057
Modified:
pypy/trunk/src/pypy/annotation/unaryop.py
pypy/trunk/src/pypy/interpreter/baseobjspace.py
pypy/trunk/src/pypy/interpreter/debug.py
pypy/trunk/src/pypy/interpreter/extmodule.py
pypy/trunk/src/pypy/interpreter/gateway.py
pypy/trunk/src/pypy/interpreter/generator.py
pypy/trunk/src/pypy/interpreter/interactive.py
pypy/trunk/src/pypy/interpreter/main.py
pypy/trunk/src/pypy/interpreter/py.py
pypy/trunk/src/pypy/interpreter/pycode.py
pypy/trunk/src/pypy/interpreter/pyopcode.py
pypy/trunk/src/pypy/interpreter/unittest_w.py
pypy/trunk/src/pypy/module/sysinterp.py
pypy/trunk/src/pypy/objspace/flow/flowcontext.py
pypy/trunk/src/pypy/objspace/flow/objspace.py
pypy/trunk/src/pypy/objspace/flow/test/test_model.py
pypy/trunk/src/pypy/objspace/std/cpythonobject.py
pypy/trunk/src/pypy/objspace/std/dictobject.py
pypy/trunk/src/pypy/objspace/std/longtype.py
pypy/trunk/src/pypy/objspace/trivial.py
pypy/trunk/src/pypy/tool/pydis.py
Log:
remove a bunch of unused imports
Modified: pypy/trunk/src/pypy/annotation/unaryop.py
==============================================================================
--- pypy/trunk/src/pypy/annotation/unaryop.py (original)
+++ pypy/trunk/src/pypy/annotation/unaryop.py Fri Jun 11 15:49:11 2004
@@ -2,7 +2,7 @@
Unary operations on SomeValues.
"""
-from pypy.annotation.pairtype import pair, pairtype
+from pypy.annotation.pairtype import pair
from pypy.annotation.model import SomeObject, SomeInteger, SomeBool
from pypy.annotation.model import SomeString, SomeList, SomeDict
from pypy.annotation.model import SomeTuple, SomeImpossibleValue
Modified: pypy/trunk/src/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/baseobjspace.py (original)
+++ pypy/trunk/src/pypy/interpreter/baseobjspace.py Fri Jun 11 15:49:11 2004
@@ -1,7 +1,6 @@
from pypy.interpreter.executioncontext import ExecutionContext
from pypy.interpreter.error import OperationError
-from pypy.interpreter.miscutils import Stack, getthreadlocals
-import pypy.module
+from pypy.interpreter.miscutils import getthreadlocals
__all__ = ['ObjSpace', 'OperationError', 'Wrappable', 'BaseWrappable']
Modified: pypy/trunk/src/pypy/interpreter/debug.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/debug.py (original)
+++ pypy/trunk/src/pypy/interpreter/debug.py Fri Jun 11 15:49:11 2004
@@ -2,7 +2,7 @@
PyPy-oriented interface to pdb.
"""
-import pdb, sys
+import pdb
def fire(operationerr):
if not operationerr.debug_excs:
Modified: pypy/trunk/src/pypy/interpreter/extmodule.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/extmodule.py (original)
+++ pypy/trunk/src/pypy/interpreter/extmodule.py Fri Jun 11 15:49:11 2004
@@ -5,7 +5,7 @@
"""
from __future__ import generators # for generators.compiler_flag
-import os, sys, types
+import os, sys
import autopath
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
Modified: pypy/trunk/src/pypy/interpreter/gateway.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/gateway.py (original)
+++ pypy/trunk/src/pypy/interpreter/gateway.py Fri Jun 11 15:49:11 2004
@@ -17,7 +17,7 @@
WeakKeyDictionary = dict # XXX for PyPy
from pypy.interpreter import eval, pycode
from pypy.interpreter.function import Function, Method
-from pypy.interpreter.baseobjspace import Wrappable, ObjSpace
+from pypy.interpreter.baseobjspace import Wrappable
class BuiltinCode(eval.Code):
Modified: pypy/trunk/src/pypy/interpreter/generator.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/generator.py (original)
+++ pypy/trunk/src/pypy/interpreter/generator.py Fri Jun 11 15:49:11 2004
@@ -2,7 +2,6 @@
from pypy.interpreter.baseobjspace import Wrappable
from pypy.interpreter.eval import Frame
from pypy.interpreter.pyframe import ControlFlowException, ExitFrame
-from pypy.interpreter import function, gateway
#
# Generator support. Note that GeneratorFrame is not a subclass of PyFrame.
Modified: pypy/trunk/src/pypy/interpreter/interactive.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/interactive.py (original)
+++ pypy/trunk/src/pypy/interpreter/interactive.py Fri Jun 11 15:49:11 2004
@@ -1,9 +1,8 @@
import autopath
-from pypy.interpreter import executioncontext, pyframe, baseobjspace
+from pypy.interpreter import executioncontext, baseobjspace
import sys
import code
-import linecache
class PyPyConsole(code.InteractiveConsole):
Modified: pypy/trunk/src/pypy/interpreter/main.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/main.py (original)
+++ pypy/trunk/src/pypy/interpreter/main.py Fri Jun 11 15:49:11 2004
@@ -1,8 +1,8 @@
import autopath
from pypy.tool import option
-from pypy.interpreter import executioncontext, baseobjspace, gateway, module
+from pypy.interpreter import executioncontext, module
from pypy.interpreter.error import OperationError, PyPyError
-import sys, os
+import sys
def _run_eval_string(source, filename, space, eval):
if eval:
Modified: pypy/trunk/src/pypy/interpreter/py.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/py.py (original)
+++ pypy/trunk/src/pypy/interpreter/py.py Fri Jun 11 15:49:11 2004
@@ -7,7 +7,7 @@
from pypy.tool import option
from pypy.tool.optik import make_option
-from pypy.interpreter import main, interactive, baseobjspace, error
+from pypy.interpreter import main, interactive, error
import sys
class Options(option.Options):
Modified: pypy/trunk/src/pypy/interpreter/pycode.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/pycode.py (original)
+++ pypy/trunk/src/pypy/interpreter/pycode.py Fri Jun 11 15:49:11 2004
@@ -6,8 +6,6 @@
import dis
from pypy.interpreter import eval
-from pypy.interpreter.error import OperationError
-
# code object contants, for co_flags below
CO_OPTIMIZED = 0x0001
Modified: pypy/trunk/src/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/pyopcode.py (original)
+++ pypy/trunk/src/pypy/interpreter/pyopcode.py Fri Jun 11 15:49:11 2004
@@ -6,7 +6,7 @@
from pypy.interpreter.baseobjspace import OperationError
from pypy.interpreter.eval import UNDEFINED
-from pypy.interpreter import baseobjspace, gateway, function
+from pypy.interpreter import gateway, function
from pypy.interpreter import pyframe, pytraceback
from pypy.interpreter.miscutils import InitializedClass
Modified: pypy/trunk/src/pypy/interpreter/unittest_w.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/unittest_w.py (original)
+++ pypy/trunk/src/pypy/interpreter/unittest_w.py Fri Jun 11 15:49:11 2004
@@ -1,6 +1,6 @@
import autopath
-import sys, os
+import os
import unittest
from pypy.interpreter import gateway
Modified: pypy/trunk/src/pypy/module/sysinterp.py
==============================================================================
--- pypy/trunk/src/pypy/module/sysinterp.py (original)
+++ pypy/trunk/src/pypy/module/sysinterp.py Fri Jun 11 15:49:11 2004
@@ -3,8 +3,7 @@
"""
import os
from pypy.interpreter import autopath
-from pypy.interpreter.module import Module
-from pypy.interpreter.pycode import PyCode
+#from pypy.interpreter.module import Module
from pypy.interpreter.error import OperationError
import sys as cpy_sys
Modified: pypy/trunk/src/pypy/objspace/flow/flowcontext.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/flowcontext.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/flowcontext.py Fri Jun 11 15:49:11 2004
@@ -1,7 +1,5 @@
from pypy.interpreter.executioncontext import ExecutionContext
-from pypy.interpreter.miscutils import Stack
-from pypy.interpreter.pyframe \
- import ControlFlowException, ExitFrame, PyFrame
+from pypy.interpreter.pyframe import ExitFrame
from pypy.interpreter.error import OperationError
from pypy.objspace.flow.model import *
from pypy.objspace.flow.framestate import FrameState
Modified: pypy/trunk/src/pypy/objspace/flow/objspace.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/objspace.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/objspace.py Fri Jun 11 15:49:11 2004
@@ -1,6 +1,5 @@
# ______________________________________________________________________
-import sys, operator, types
-import pypy
+import sys, operator
from pypy.interpreter.baseobjspace import ObjSpace
from pypy.interpreter.pycode import PyCode
from pypy.interpreter.error import OperationError
Modified: pypy/trunk/src/pypy/objspace/flow/test/test_model.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/test/test_model.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/test/test_model.py Fri Jun 11 15:49:11 2004
@@ -23,6 +23,7 @@
def test_simplefunc(self):
graph = self.getflow(self.simplefunc)
l = flatten(graph)
+ print l
self.assertEquals(len(l), 4)
def test_class(self):
Modified: pypy/trunk/src/pypy/objspace/std/cpythonobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/cpythonobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/cpythonobject.py Fri Jun 11 15:49:11 2004
@@ -3,8 +3,6 @@
from pypy.objspace.std.objspace import *
from pypy.interpreter.function import Function
-from stringobject import W_StringObject
-from intobject import W_IntObject
from default import UnwrapError
import sys, operator, types
Modified: pypy/trunk/src/pypy/objspace/std/dictobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/dictobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/dictobject.py Fri Jun 11 15:49:11 2004
@@ -7,7 +7,6 @@
from pypy.objspace.std.objspace import *
from pypy.interpreter import gateway
-from stringobject import W_StringObject
from restricted_int import r_uint
Modified: pypy/trunk/src/pypy/objspace/std/longtype.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/longtype.py (original)
+++ pypy/trunk/src/pypy/objspace/std/longtype.py Fri Jun 11 15:49:11 2004
@@ -1,6 +1,5 @@
from pypy.objspace.std.stdtypedef import *
from pypy.objspace.std.objecttype import object_typedef
-from pypy.interpreter.error import OperationError
def descr__new__(space, w_longtype, w_value=None):
from longobject import W_LongObject
Modified: pypy/trunk/src/pypy/objspace/trivial.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/trivial.py (original)
+++ pypy/trunk/src/pypy/objspace/trivial.py Fri Jun 11 15:49:11 2004
@@ -4,10 +4,10 @@
# correctly wrap the exceptions.
#
-from pypy.interpreter import pyframe, gateway
+from pypy.interpreter import gateway
from pypy.interpreter.baseobjspace import *
from pypy.objspace.descroperation import DescrOperation, Object
-import operator, types, new, sys
+import operator, types, sys
import __builtin__ as cpy_builtin
class CPyWrapper(object):
Modified: pypy/trunk/src/pypy/tool/pydis.py
==============================================================================
--- pypy/trunk/src/pypy/tool/pydis.py (original)
+++ pypy/trunk/src/pypy/tool/pydis.py Fri Jun 11 15:49:11 2004
@@ -7,7 +7,6 @@
import autopath
import sys
-import types
from pypy.tool.opcode import *
from pypy.tool.opcode import __all__ as _opcodes_all
More information about the Pypy-commit
mailing list