diff options
| author | xmo-odoo <xmo@odoo.com> | 2017-04-24 15:19:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 15:19:55 +0200 |
| commit | 90645ad3922c1b20e0e4882a5dee0e254bb6f4e4 (patch) | |
| tree | 5918da9b18a0c3659f1373dbe3966f4e09a3bdda /odoo | |
| parent | 95702929b185372128c4bfb1d6f09a15b0479dd0 (diff) | |
[FIX] function introspection attributes
Introspection attributes on function and methods were originally
prefixed with func_ or im_ e.g. im_class or func_name. For coherence with the
rest of the data model, Python 3 added dunder attributes (__func__,
__code__) and removed the old style, the dunder attributes were
backported to Python 2.6.
Use dunder attributes everywhere we're currently using func_* or im_*
attributes.
Fixers:
lib2to3.fixes.fix_funcattrs
lib2to3.fixes.fix_methodattrs
#8530
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/http.py | 4 | ||||
| -rw-r--r-- | odoo/tools/cache.py | 4 | ||||
| -rw-r--r-- | odoo/tools/misc.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/odoo/http.py b/odoo/http.py index 015c00342b4..a8dbf098576 100644 --- a/odoo/http.py +++ b/odoo/http.py @@ -966,8 +966,8 @@ def routing_map(modules, nodb_only, converters=None): routing = dict(type='http', auth='user', methods=None, routes=None) methods_done = list() # update routing attributes from subclasses(auth, methods...) - for claz in reversed(mv.im_class.mro()): - fn = getattr(claz, mv.func_name, None) + for claz in reversed(mv.__self__.__class__.mro()): + fn = getattr(claz, mv.__name__, None) if fn and hasattr(fn, 'routing') and fn not in methods_done: methods_done.append(fn) routing.update(fn.routing) diff --git a/odoo/tools/cache.py b/odoo/tools/cache.py index ac776eefa74..3703fc83ab1 100644 --- a/odoo/tools/cache.py +++ b/odoo/tools/cache.py @@ -217,8 +217,8 @@ def log_ormcache_stats(sig=None, frame=None): def get_cache_key_counter(bound_method, *args, **kwargs): """ Return the cache, key and stat counter for the given call. """ - model = bound_method.im_self - ormcache = bound_method.clear_cache.im_self + model = bound_method.__self__ + ormcache = bound_method.clear_cache.__self__ cache, key0, counter = ormcache.lru(model) key = key0 + ormcache.key(model, *args, **kwargs) return cache, key, counter diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py index e0456a8429b..ebeb65c3523 100644 --- a/odoo/tools/misc.py +++ b/odoo/tools/misc.py @@ -471,7 +471,7 @@ class profile(object): def wrapper(*args, **kwargs): profile = cProfile.Profile() result = profile.runcall(f, *args, **kwargs) - profile.dump_stats(self.fname or ("%s.cprof" % (f.func_name,))) + profile.dump_stats(self.fname or ("%s.cprof" % (f.__name__,))) return result return wrapper |