X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3c26965045e8881acd4d5de8c195e4aa61b95ed1..82fbb035b6b18ed8ea90621c8fa78022e8ef1dfb:/contrib/gilbert/extdirect/core.py?ds=inline diff --git a/contrib/gilbert/extdirect/core.py b/contrib/gilbert/extdirect/core.py index 42c24c0..f0a4e2a 100644 --- a/contrib/gilbert/extdirect/core.py +++ b/contrib/gilbert/extdirect/core.py @@ -1,13 +1,13 @@ -import sys -import datetime +from django.db.models import Q +from django.http import HttpResponse +from django.utils import simplejson as json +from django.utils.encoding import smart_str +from django.views.debug import ExceptionReporter from inspect import isclass, ismethod, isfunction, getmembers, getargspec from traceback import format_tb from abc import ABCMeta, abstractproperty from collections import Callable, Sized, Mapping -from django.utils import simplejson as json -from django.views.debug import ExceptionReporter -from django.http import HttpResponse -from django.db.models import Q +import sys, datetime # __all__ = ('ext_action', 'ext_method', 'is_ext_action', 'is_ext_method', 'ExtAction', 'ExtMethod') @@ -225,7 +225,7 @@ class ExtMethod(Callable, Sized): keywords = {} if self.accepts_keywords: - keywords = args.pop() + keywords = dict([(smart_str(k, 'ascii'), v) for k,v in args.pop().items()]) varargs = [] if self.accepts_varargs: