Skip to content

Commit

Permalink
Fix object references in test harnesses.
Browse files Browse the repository at this point in the history
  • Loading branch information
@GrahamDumpleton
GrahamDumpleton committed Nov 4, 2023
1 parent f7e9cab commit 8567e8b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 32 deletions.
1 change: 0 additions & 1 deletion tests/test_function_wrapper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import unittest

import wrapt
import wrapt.wrappers

from compat import PY2, PY3, exec_

Expand Down
60 changes: 30 additions & 30 deletions tests/test_object_proxy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,7 @@ def test_self_keyword_argument_on_dict(self):
# A dict when given self as keyword argument uses it to create item in
# the dict and no attempt is made to use a positional argument.

d = wrapt.wrappers.CallableObjectProxy(dict)(self='self')
d = wrapt.CallableObjectProxy(dict)(self='self')

self.assertEqual(d, dict(self='self'))

Expand All @@ -1867,7 +1867,7 @@ def __init__(self, *args, **kwargs):
self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})

o = wrapt.wrappers.CallableObjectProxy(Object)('arg1')
o = wrapt.CallableObjectProxy(Object)('arg1')

self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})
Expand All @@ -1884,7 +1884,7 @@ def __init__(self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.CallableObjectProxy(Object)(self='self')
wrapt.CallableObjectProxy(Object)(self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

Expand All @@ -1900,7 +1900,7 @@ def __init__(self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.CallableObjectProxy(Object)(arg1='arg1', self='self')
wrapt.CallableObjectProxy(Object)(arg1='arg1', self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

Expand All @@ -1915,7 +1915,7 @@ def __init__(_self, *args, **kwargs):
self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))

o = wrapt.wrappers.CallableObjectProxy(Object)(self='self')
o = wrapt.CallableObjectProxy(Object)(self='self')

self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))
Expand All @@ -1933,7 +1933,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertEqual(o._kwargs, {})
self.assertEqual(o._self, 'self')

o = wrapt.wrappers.CallableObjectProxy(Object)(self='self')
o = wrapt.CallableObjectProxy(Object)(self='self')

self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, {})
Expand All @@ -1952,7 +1952,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.CallableObjectProxy(Object)(_self='self')
wrapt.CallableObjectProxy(Object)(_self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

Expand All @@ -1962,7 +1962,7 @@ def test_self_keyword_argument_on_dict_1(self):
# A dict when given self as keyword argument uses it to create item in
# the dict and no attempt is made to use a positional argument.

wrapper = wrapt.wrappers.PartialCallableObjectProxy(dict, arg1='arg1')
wrapper = wrapt.PartialCallableObjectProxy(dict, arg1='arg1')

d = wrapper(self='self')

Expand All @@ -1972,7 +1972,7 @@ def test_self_keyword_argument_on_dict_2(self):
# A dict when given self as keyword argument uses it to create item in
# the dict and no attempt is made to use a positional argument.

wrapper = wrapt.wrappers.PartialCallableObjectProxy(dict, self='self')
wrapper = wrapt.PartialCallableObjectProxy(dict, self='self')

d = wrapper(arg1='arg1')

Expand All @@ -1989,7 +1989,7 @@ def __init__(self, *args, **kwargs):
self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, 'arg1')
wrapper = wrapt.PartialCallableObjectProxy(Object, 'arg1')

o = wrapper()

Expand All @@ -2007,7 +2007,7 @@ def __init__(self, *args, **kwargs):
self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

o = wrapper('arg1')

Expand All @@ -2025,7 +2025,7 @@ def __init__(self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, self='self')
wrapper = wrapt.PartialCallableObjectProxy(Object, self='self')

with self.assertRaises(TypeError) as e:
o = wrapper()
Expand All @@ -2043,7 +2043,7 @@ def __init__(self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

with self.assertRaises(TypeError) as e:
o = wrapper(self='self')
Expand All @@ -2061,7 +2061,7 @@ def __init__(self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, arg1='arg1', self='self')
wrapper = wrapt.PartialCallableObjectProxy(Object, arg1='arg1', self='self')

with self.assertRaises(TypeError) as e:
o = wrapper()
Expand All @@ -2079,7 +2079,7 @@ def __init__(self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

with self.assertRaises(TypeError) as e:
o = wrapper(arg1='arg1', self='self')
Expand All @@ -2097,7 +2097,7 @@ def __init__(_self, *args, **kwargs):
self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, self='self')
wrapper = wrapt.PartialCallableObjectProxy(Object, self='self')

o = wrapper()

Expand All @@ -2115,7 +2115,7 @@ def __init__(_self, *args, **kwargs):
self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

o = wrapper(self='self')

Expand All @@ -2135,7 +2135,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertEqual(o._kwargs, {})
self.assertEqual(o._self, 'self')

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, self='self')
wrapper = wrapt.PartialCallableObjectProxy(Object, self='self')

o = wrapper()

Expand All @@ -2156,7 +2156,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertEqual(o._kwargs, {})
self.assertEqual(o._self, 'self')

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

o = wrapper(self='self')

Expand All @@ -2176,7 +2176,7 @@ def __init__(_self, self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object, _self='self')
wrapper = wrapt.PartialCallableObjectProxy(Object, _self='self')

with self.assertRaises(TypeError) as e:
o = wrapper()
Expand All @@ -2195,7 +2195,7 @@ def __init__(_self, self, *args, **kwargs):

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

wrapper = wrapt.wrappers.PartialCallableObjectProxy(Object)
wrapper = wrapt.PartialCallableObjectProxy(Object)

with self.assertRaises(TypeError) as e:
o = wrapper(_self='self')
Expand All @@ -2211,7 +2211,7 @@ def test_self_keyword_argument_on_dict(self):
def wrapper(wrapped, instance, args, kwargs):
return wrapped(*args, **kwargs)

d = wrapt.wrappers.FunctionWrapper(dict, wrapper)(self='self')
d = wrapt.FunctionWrapper(dict, wrapper)(self='self')

self.assertEqual(d, dict(self='self'))

Expand All @@ -2229,7 +2229,7 @@ def __init__(self, *args, **kwargs):
self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})

o = wrapt.wrappers.FunctionWrapper(Object, wrapper)('arg1')
o = wrapt.FunctionWrapper(Object, wrapper)('arg1')

self.assertEqual(o._args, ('arg1',))
self.assertEqual(o._kwargs, {})
Expand All @@ -2249,7 +2249,7 @@ def __init__(self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.FunctionWrapper(Object, wrapper)(self='self')
wrapt.FunctionWrapper(Object, wrapper)(self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

Expand All @@ -2268,7 +2268,7 @@ def __init__(self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.FunctionWrapper(Object, wrapper)(arg1='arg1', self='self')
wrapt.FunctionWrapper(Object, wrapper)(arg1='arg1', self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument 'self'.*", str(e.exception)), None)

Expand All @@ -2286,7 +2286,7 @@ def __init__(_self, *args, **kwargs):
self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))

o = wrapt.wrappers.FunctionWrapper(Object, wrapper)(self='self')
o = wrapt.FunctionWrapper(Object, wrapper)(self='self')

self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, dict(self="self"))
Expand All @@ -2307,7 +2307,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertEqual(o._kwargs, {})
self.assertEqual(o._self, 'self')

o = wrapt.wrappers.FunctionWrapper(Object, wrapper)(self='self')
o = wrapt.FunctionWrapper(Object, wrapper)(self='self')

self.assertEqual(o._args, ())
self.assertEqual(o._kwargs, {})
Expand All @@ -2329,7 +2329,7 @@ def __init__(_self, self, *args, **kwargs):
self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

with self.assertRaises(TypeError) as e:
wrapt.wrappers.FunctionWrapper(Object, wrapper)(_self='self')
wrapt.FunctionWrapper(Object, wrapper)(_self='self')

self.assertNotEqual(re.match(".*got multiple values for (keyword )?argument '_self'.*", str(e.exception)), None)

Expand All @@ -2344,7 +2344,7 @@ class Object:
def function(cls, self, *args, **kwargs):
return self, args, kwargs

function = wrapt.wrappers.FunctionWrapper(function, wrapper)
function = wrapt.FunctionWrapper(function, wrapper)

result = Object().function(self='self')

Expand All @@ -2358,7 +2358,7 @@ class Object:
def function(_self, self, *args, **kwargs):
return self, args, kwargs

function = wrapt.wrappers.FunctionWrapper(function, wrapper)
function = wrapt.FunctionWrapper(function, wrapper)

result = Object().function(self='self')

Expand Down
2 changes: 1 addition & 1 deletion tests/test_weak_function_proxy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def test_self_keyword_argument(self):
def function(self, *args, **kwargs):
return self, args, kwargs

proxy = wrapt.wrappers.WeakFunctionProxy(function)
proxy = wrapt.WeakFunctionProxy(function)

self.assertEqual(proxy(self='self', arg1='arg1'), ('self', (), dict(arg1='arg1')))

Expand Down

0 comments on commit 8567e8b

Please sign in to comment.