Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59800:03c299d3e6d3
Date: 2013-01-06 00:36 +0100
http://bitbucket.org/pypy/pypy/changeset/03c299d3e6d3/
Log: Moved descriptor to rpython
diff --git a/pypy/module/thread/test/test_ll_thread.py
b/pypy/module/thread/test/test_rthread.py
rename from pypy/module/thread/test/test_ll_thread.py
rename to pypy/module/thread/test/test_rthread.py
diff --git a/pypy/tool/test/test_descriptor.py
b/pypy/tool/test/test_descriptor.py
--- a/pypy/tool/test/test_descriptor.py
+++ b/pypy/tool/test/test_descriptor.py
@@ -1,4 +1,4 @@
-from pypy.tool.descriptor import InstanceMethod
+rpython.tool.descriptor import InstanceMethod
class X(object):
def f(self, *args, **kwds):
diff --git a/rpython/annotator/model.py b/rpython/annotator/model.py
--- a/rpython/annotator/model.py
+++ b/rpython/annotator/model.py
@@ -31,7 +31,7 @@
from types import BuiltinFunctionType, MethodType, FunctionType
import rpython
-from pypy.tool import descriptor
+from rpython.tool import descriptor
from rpython.tool.pairtype import pair, extendabletype
from rpython.rlib.rarithmetic import r_uint, r_ulonglong, base_int
from rpython.rlib.rarithmetic import r_singlefloat, r_longfloat
diff --git a/rpython/flowspace/test/test_objspace.py
b/rpython/flowspace/test/test_objspace.py
--- a/rpython/flowspace/test/test_objspace.py
+++ b/rpython/flowspace/test/test_objspace.py
@@ -706,7 +706,7 @@
def test_catch_importerror_1(self):
def f():
try:
- import pypy.this_does_not_exist
+ import rpython.this_does_not_exist
except ImportError:
return 1
graph = self.codetest(f)
@@ -719,7 +719,7 @@
def test_catch_importerror_2(self):
def f():
try:
- from pypy import this_does_not_exist
+ from rpython import this_does_not_exist
except ImportError:
return 1
graph = self.codetest(f)
@@ -731,12 +731,12 @@
def test_importerror_1(self):
def f():
- import pypy.this_does_not_exist
+ import rpython.this_does_not_exist
py.test.raises(ImportError, 'self.codetest(f)')
def test_importerror_2(self):
def f():
- from pypy import this_does_not_exist
+ from rpython import this_does_not_exist
py.test.raises(ImportError, 'self.codetest(f)')
def test_relative_import(self):
diff --git a/pypy/tool/descriptor.py b/rpython/tool/descriptor.py
rename from pypy/tool/descriptor.py
rename to rpython/tool/descriptor.py
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
