Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r45657:39ad5205b27a
Date: 2011-07-15 23:31 -0700
http://bitbucket.org/pypy/pypy/changeset/39ad5205b27a/
Log: fix more stuff.
diff --git a/pypy/module/__builtin__/descriptor.py
b/pypy/module/__builtin__/descriptor.py
--- a/pypy/module/__builtin__/descriptor.py
+++ b/pypy/module/__builtin__/descriptor.py
@@ -1,5 +1,6 @@
from pypy.interpreter.baseobjspace import Wrappable
from pypy.interpreter.error import OperationError
+from pypy.interpreter.function import StaticMethod, ClassMethod
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.interpreter.typedef import (TypeDef, interp_attrproperty_w,
generic_new_descr)
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -14,7 +14,7 @@
# Constants and exposed functions
from pypy.rlib.rsre import rsre_core
-from pypy.rlib.rsre.rsre_char import CODESIZE, getlower, set_unicode_db
+from pypy.rlib.rsre.rsre_char import MAGIC, CODESIZE, getlower, set_unicode_db
@unwrap_spec(char_ord=int, flags=int)
def w_getlower(space, char_ord, flags):
diff --git a/pypy/module/struct/interp_struct.py
b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -1,8 +1,7 @@
from pypy.interpreter.gateway import unwrap_spec
+from pypy.module.struct.formatiterator import PackFormatIterator,
UnpackFormatIterator
from pypy.rlib.rstruct.error import StructError
-from pypy.module.struct.formatiterator import (CalcSizeFormatIterator,
- PackFormatIterator, UnpackFormatIterator)
-
+from pypy.rlib.rstruct.formatiterator import CalcSizeFormatIterator
@unwrap_spec(format=str)
def calcsize(space, format):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
