parent
4df19233c9
commit
18ed87cddf
|
@ -60,15 +60,15 @@ class _ObjectProxyMethods(object):
|
|||
return self.__wrapped__.__weakref__
|
||||
|
||||
class _ObjectProxyMetaType(type):
|
||||
def __new__(cls, name, bases, dictionary):
|
||||
def __new__(cls, name, bases, dictionary):
|
||||
# Copy our special properties into the class so that they
|
||||
# always take precedence over attributes of the same name added
|
||||
# during construction of a derived class. This is to save
|
||||
# duplicating the implementation for them in all derived classes.
|
||||
|
||||
dictionary.update(vars(_ObjectProxyMethods))
|
||||
dictionary.update(vars(_ObjectProxyMethods))
|
||||
|
||||
return type.__new__(cls, name, bases, dictionary)
|
||||
return type.__new__(cls, name, bases, dictionary)
|
||||
|
||||
class ObjectProxy(with_metaclass(_ObjectProxyMetaType)):
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ version = tuple(sys.version_info[:2])
|
|||
|
||||
class DummyCollector(pytest.collect.File):
|
||||
def collect(self):
|
||||
return []
|
||||
return []
|
||||
|
||||
def pytest_pycollect_makemodule(path, parent):
|
||||
if '_py33' in path.basename and version < (3, 3):
|
||||
|
|
|
@ -7,17 +7,17 @@ import wrapt
|
|||
class TestArguments(unittest.TestCase):
|
||||
|
||||
def test_getcallargs(self):
|
||||
def function(a, b=2, c=3, d=4, e=5, *args, **kwargs):
|
||||
pass
|
||||
def function(a, b=2, c=3, d=4, e=5, *args, **kwargs):
|
||||
pass
|
||||
|
||||
expected = {'a': 10, 'c': 3, 'b': 20, 'e': 5, 'd': 40,
|
||||
'args': (), 'kwargs': {'f': 50}}
|
||||
calculated = wrapt.getcallargs(function, 10, 20, d=40, f=50)
|
||||
expected = {'a': 10, 'c': 3, 'b': 20, 'e': 5, 'd': 40,
|
||||
'args': (), 'kwargs': {'f': 50}}
|
||||
calculated = wrapt.getcallargs(function, 10, 20, d=40, f=50)
|
||||
|
||||
self.assertEqual(expected, calculated)
|
||||
self.assertEqual(expected, calculated)
|
||||
|
||||
expected = {'a': 10, 'c': 30, 'b': 20, 'e': 50, 'd': 40,
|
||||
'args': (60,), 'kwargs': {}}
|
||||
calculated = wrapt.getcallargs(function, 10, 20, 30, 40, 50, 60)
|
||||
expected = {'a': 10, 'c': 30, 'b': 20, 'e': 50, 'd': 40,
|
||||
'args': (60,), 'kwargs': {}}
|
||||
calculated = wrapt.getcallargs(function, 10, 20, 30, 40, 50, 60)
|
||||
|
||||
self.assertEqual(expected, calculated)
|
||||
self.assertEqual(expected, calculated)
|
||||
|
|
|
@ -54,41 +54,41 @@ c1 = C1()
|
|||
|
||||
class TestSynchronized(unittest.TestCase):
|
||||
|
||||
def test_function(self):
|
||||
value1 = function1(10, '0123456789')
|
||||
value2 = function1(10, '0123456789')
|
||||
def test_function(self):
|
||||
value1 = function1(10, '0123456789')
|
||||
value2 = function1(10, '0123456789')
|
||||
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
|
||||
self.assertTrue(hasattr(function1, '_memoize_cache'))
|
||||
self.assertTrue(hasattr(function1, '_memoize_cache'))
|
||||
|
||||
def test_instancemethod(self):
|
||||
value1 = c1.function1(10, '0123456789')
|
||||
value2 = c1.function1(10, '0123456789')
|
||||
def test_instancemethod(self):
|
||||
value1 = c1.function1(10, '0123456789')
|
||||
value2 = c1.function1(10, '0123456789')
|
||||
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
|
||||
self.assertTrue(hasattr(C1.function1, '_memoize_cache'))
|
||||
self.assertTrue(hasattr(C1.function1, '_memoize_cache'))
|
||||
|
||||
def test_classmethod(self):
|
||||
value1 = C1.function2(10, '0123456789')
|
||||
value2 = C1.function2(10, '0123456789')
|
||||
def test_classmethod(self):
|
||||
value1 = C1.function2(10, '0123456789')
|
||||
value2 = C1.function2(10, '0123456789')
|
||||
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
|
||||
self.assertTrue(hasattr(C1.function2, '_memoize_cache'))
|
||||
self.assertTrue(hasattr(C1.function2, '_memoize_cache'))
|
||||
|
||||
def test_staticmethod(self):
|
||||
value1 = C1.function3(10, '0123456789')
|
||||
value2 = C1.function3(10, '0123456789')
|
||||
def test_staticmethod(self):
|
||||
value1 = C1.function3(10, '0123456789')
|
||||
value2 = C1.function3(10, '0123456789')
|
||||
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
self.assertEqual(value1, value2)
|
||||
self.assertEqual(id(value1), id(value2))
|
||||
|
||||
self.assertTrue(hasattr(C1.function3, '_memoize_cache'))
|
||||
self.assertTrue(hasattr(C1.function3, '_memoize_cache'))
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Loading…
Reference in New Issue