[pypy-svn] r37655 - in pypy/dist/pypy/module/clr: . test
antocuni at codespeak.net
antocuni at codespeak.net
Wed Jan 31 11:34:59 CET 2007
Author: antocuni
Date: Wed Jan 31 11:34:58 2007
New Revision: 37655
Modified:
pypy/dist/pypy/module/clr/__init__.py
pypy/dist/pypy/module/clr/app_clr.py
pypy/dist/pypy/module/clr/interp_clr.py
pypy/dist/pypy/module/clr/test/test_clr.py
Log:
_dotnet to clr renaming part 3: fix imports.
Modified: pypy/dist/pypy/module/clr/__init__.py
==============================================================================
--- pypy/dist/pypy/module/clr/__init__.py (original)
+++ pypy/dist/pypy/module/clr/__init__.py Wed Jan 31 11:34:58 2007
@@ -9,8 +9,7 @@
appleveldefs = {}
interpleveldefs = {
- '_CliObject_internal': 'interp_dotnet.W_CliObject',
- 'call_staticmethod': 'interp_dotnet.call_staticmethod',
- 'load_cli_class': 'interp_dotnet.load_cli_class',
+ '_CliObject_internal': 'interp_clr.W_CliObject',
+ 'call_staticmethod': 'interp_clr.call_staticmethod',
+ 'load_cli_class': 'interp_clr.load_cli_class',
}
-
Modified: pypy/dist/pypy/module/clr/app_clr.py
==============================================================================
--- pypy/dist/pypy/module/clr/app_clr.py (original)
+++ pypy/dist/pypy/module/clr/app_clr.py Wed Jan 31 11:34:58 2007
@@ -8,8 +8,8 @@
self.meth_name = meth_name
def __call__(self, *args):
- import _dotnet
- return _dotnet.call_staticmethod(self.class_name, self.meth_name, args)
+ import clr
+ return clr.call_staticmethod(self.class_name, self.meth_name, args)
def __repr__(self):
return '<static CLI method %s.%s>' % (self.class_name, self.meth_name)
@@ -73,8 +73,8 @@
__slots__ = ('__cliobj__',)
def __init__(self, *args):
- import _dotnet
- self.__cliobj__ = _dotnet._CliObject_internal(self.__cliclass__, args)
+ import clr
+ self.__cliobj__ = clr._CliObject_internal(self.__cliclass__, args)
def build_wrapper(namespace, classname, staticmethods, methods, properties, indexers):
Modified: pypy/dist/pypy/module/clr/interp_clr.py
==============================================================================
--- pypy/dist/pypy/module/clr/interp_clr.py (original)
+++ pypy/dist/pypy/module/clr/interp_clr.py Wed Jan 31 11:34:58 2007
@@ -183,7 +183,7 @@
)
path, _ = os.path.split(__file__)
-app_dotnet = os.path.join(path, 'app_dotnet.py')
-app = ApplevelClass(file(app_dotnet).read())
-del path, app_dotnet
+app_clr = os.path.join(path, 'app_clr.py')
+app = ApplevelClass(file(app_clr).read())
+del path, app_clr
build_wrapper = app.interphook("build_wrapper")
Modified: pypy/dist/pypy/module/clr/test/test_clr.py
==============================================================================
--- pypy/dist/pypy/module/clr/test/test_clr.py (original)
+++ pypy/dist/pypy/module/clr/test/test_clr.py Wed Jan 31 11:34:58 2007
@@ -2,18 +2,18 @@
class AppTestDotnet:
def setup_class(cls):
- space = gettestobjspace(usemodules=('_dotnet',))
+ space = gettestobjspace(usemodules=('clr',))
cls.space = space
def test_cliobject(self):
- import _dotnet
- obj = _dotnet._CliObject_internal('System.Collections.ArrayList', [])
+ import clr
+ obj = clr._CliObject_internal('System.Collections.ArrayList', [])
max_index = obj.call_method('Add', [42])
assert max_index == 0
def test_ArrayList(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
obj.Add(42)
obj.Add(43)
@@ -21,29 +21,29 @@
assert total == 42+43
def test_ArrayList_error(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
raises(StandardError, obj.get_Item, 0)
def test_float_conversion(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
obj.Add(42.0)
item = obj.get_Item(0)
assert isinstance(item, float)
def test_getitem(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
obj.Add(42)
assert obj[0] == 42
def test_property(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
obj.Add(42)
assert obj.Count == 1
@@ -51,21 +51,21 @@
assert obj.Capacity == 10
def test_unboundmethod(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
ArrayList.Add(obj, 42)
assert obj.get_Item(0) == 42
def test_unboundmethod_typeerror(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
raises(TypeError, ArrayList.Add)
raises(TypeError, ArrayList.Add, 0)
def test_overload(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList()
for i in range(10):
obj.Add(i)
@@ -73,8 +73,8 @@
assert obj.IndexOf(7, 0, 5) == -1
def test_staticmethod(self):
- import _dotnet
- Math = _dotnet.load_cli_class('System', 'Math')
+ import clr
+ Math = clr.load_cli_class('System', 'Math')
res = Math.Abs(-42)
assert res == 42
assert type(res) is int
@@ -83,7 +83,7 @@
assert type(res) is float
def test_constructor_args(self):
- import _dotnet
- ArrayList = _dotnet.load_cli_class('System.Collections', 'ArrayList')
+ import clr
+ ArrayList = clr.load_cli_class('System.Collections', 'ArrayList')
obj = ArrayList(42)
assert obj.Capacity == 42
More information about the Pypy-commit
mailing list