0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

api py3 fix

Browse source
This commit is contained in:
j 2016-09-23 22:57:46 +02:00
parent ee2c59047b
commit 263b5c9ce2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pandora/oxdjango/api/actions.py
View file

@ -5,6 +5,7 @@ from __future__ import division, absolute_import
import inspect import inspect
import sys import sys
from six import PY2
from django.conf import settings from django.conf import settings
from ..shortcuts import render_to_json_response, json_response from ..shortcuts import render_to_json_response, json_response
@ -17,7 +18,7 @@ def autodiscover(self=None):
if app != 'api': if app != 'api':
mod = import_module(app) mod = import_module(app)
try: try:
import_module('%s.views'%app) import_module('%s.views' % app)
except: except:
if module_has_submodule(mod, 'views'): if module_has_submodule(mod, 'views'):
raise raise
@ -109,8 +110,12 @@ class ApiActions(dict):
if name != 'api' and hasattr(f, 'func_closure') and f.func_closure: if name != 'api' and hasattr(f, 'func_closure') and f.func_closure:
fc = filter(lambda c: hasattr(c.cell_contents, '__call__'), f.func_closure) fc = filter(lambda c: hasattr(c.cell_contents, '__call__'), f.func_closure)
f = fc[len(fc)-1].cell_contents f = fc[len(fc)-1].cell_contents
info = f.func_code.co_filename[len(settings.PROJECT_ROOT)+1:] if PY2:
info = u'%s:%s' % (info, f.func_code.co_firstlineno) info = f.func_code.co_filename[len(settings.PROJECT_ROOT)+1:]
info = u'%s:%s' % (info, f.func_code.co_firstlineno)
else:
info = f.__code__.co_filename[len(settings.PROJECT_ROOT)+1:]
info = u'%s:%s' % (info, f.__code__.co_firstlineno)
return info, trim(inspect.getsource(f)) return info, trim(inspect.getsource(f))
def register(self, method, action=None, cache=True, version=None): def register(self, method, action=None, cache=True, version=None):