Skip to content

refactor: port code to Python 3.x #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xenophonf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: port code to Python 3.x #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions lib/pydvice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import uuid
import types
import functools
from functools import reduce

def make_consuming_chain(*functions, **kwargs):
'''
Expand All @@ -20,7 +21,7 @@ def __init__(self, **kwargs):
self.options = kwargs;

def __call__(self, f):
[setattr(f, opt, val) for (opt, val) in self.options.items()]
[setattr(f, opt, val) for (opt, val) in list(self.options.items())]
return f

class PydviceError(Exception): pass
Expand Down Expand Up @@ -50,8 +51,8 @@ def defines(cls, name, advice=None, **options):
def sort_fun_advice(cls, ad_list):
def consider_position(it, ad):
pos = ad.options['position']
if isinstance(pos, types.DictType):
where, what = pos.items().pop()
if isinstance(pos, dict):
where, what = list(pos.items()).pop()
pos = {
'before': it.index(what.advice),
'after': it.index(what.advice) + 1
Expand All @@ -63,20 +64,20 @@ def consider_position(it, ad):

def typekey(a):
return {
isinstance(a.options['position'], types.DictType): 1,
isinstance(a.options['position'], types.StringTypes): 0
isinstance(a.options['position'], dict): 1,
isinstance(a.options['position'], (str,)): 0
}.get(True, 3)

def sortkey(a):
return {
isinstance(a.options['position'], types.IntType): a.options['position']
isinstance(a.options['position'], int): a.options['position']
}.get(True, 'z%s' % a.index)



return make_consuming_chain(
lambda al: ([a for a in al if not a.options.has_key('position')],
[a for a in al if a.options.has_key('position')]),
lambda al: ([a for a in al if 'position' not in a.options],
[a for a in al if 'position' in a.options]),
lambda al_pal: (lambda al, pal:
(sorted(al, key = lambda a: a.key),
sorted(pal, key = lambda a: (a._meta.get('priority', None),
Expand Down Expand Up @@ -107,13 +108,13 @@ def _register(cls, fun, advice):
def reset(cls):
cls.deactivate_all()
[[a.unbind() for a in reversed(advice)]
for fun, advice in cls.advised.items()]
for fun, advice in list(cls.advised.items())]
cls.advised = {}

@classmethod
def deactivate_all(cls):
[advice.deactivate()
for funlists in cls.advised.values()
for funlists in list(cls.advised.values())
for advice in funlists]

class BaseAdvice(object):
Expand Down Expand Up @@ -149,13 +150,13 @@ def key(self):


def init_fun(self, fun):
fun = fun if isinstance(fun, types.FunctionType) else fun.im_func
fun = fun if isinstance(fun, types.FunctionType) else fun.__func__
self.fun_ref = fun
self.fun = types.FunctionType(fun.func_code,
fun.func_globals,
self.fun = types.FunctionType(fun.__code__,
fun.__globals__,
fun.__name__,
fun.func_defaults,
fun.func_closure)
fun.__defaults__,
fun.__closure__)
return fun


Expand All @@ -182,12 +183,12 @@ def bind(self):
while not call_expr['bound']:
caller = eval(compile(call_expr['expr'].format(**call_expr),
'<pydvice.%s>' % self.position, 'eval'))
try: self.fun_ref.func_code = types.FunctionType(caller.func_code,
self.fun_ref.func_globals,
try: self.fun_ref.__code__ = types.FunctionType(caller.__code__,
self.fun_ref.__globals__,
self.fun_ref.__name__,
self.fun_ref.func_defaults,
self.fun_ref.func_closure).func_code
except ValueError, e:
self.fun_ref.__defaults__,
self.fun_ref.__closure__).__code__
except ValueError as e:
if 'closure of length' not in str(e): raise

call_expr['freevars'].append('__%s' % uuid.uuid4().hex)
Expand All @@ -200,12 +201,12 @@ def bind(self):
)
else:
call_expr['bound'] = True
self.fun_ref.func_globals.update(**{self.shadow_name: self})
self.fun_ref.__globals__.update(**{self.shadow_name: self})
return self

def unbind(self):
self.fun_ref.func_code = self.fun.func_code
self.fun_ref.func_globals.pop(self.shadow_name, None)
self.fun_ref.__code__ = self.fun.__code__
self.fun_ref.__globals__.pop(self.shadow_name, None)
return self

def deactivate(self):
Expand Down Expand Up @@ -238,7 +239,7 @@ def act(self, *args, **kwargs):
maybe_args = self.advice(*args, **kwargs)

if maybe_args is not None:
maybe_args = maybe_args if isinstance(maybe_args, types.TupleType) else (maybe_args,)
maybe_args = maybe_args if isinstance(maybe_args, tuple) else (maybe_args,)

try:
args, kwargs = {1: (maybe_args, kwargs),
Expand Down
2 changes: 1 addition & 1 deletion test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def test_before_modify_params(self):
def make_it_cake_instead(o):
return "I want cake %s" % (o)

self.assertTrue(isinstance(self.identity(self), types.StringTypes),
self.assertTrue(isinstance(self.identity(self), (str,)),
"Identity should sudently find itself retruning strings.")
self.assertTrue(self.identity(self).startswith("I want cake"),
"Identity should begin to exclaim it's hungry")
Expand Down