ynerant/django-cas-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow both unicode and bytes dotted string in utils.import_attr

Browse Source
This commit is contained in:
Valentin Samir 2016-09-18 11:21:33 +02:00
parent 75b3fe4db0
commit 37c975eaf7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.rst
View File

@ -13,6 +13,10 @@ Added
----- -----
* Add a test for login with missing parameter (username or password or both) * Add a test for login with missing parameter (username or password or both)
Fixed
-----
* Allow both unicode and bytes dotted string in utils.import_attr
v0.7.4 - 2016-09-07 v0.7.4 - 2016-09-07
=================== ===================

12
cas_server/utils.py
View File

@ -117,14 +117,18 @@ def import_attr(path):
transform a python dotted path to the attr transform a python dotted path to the attr
:param path: A dotted path to a python object or a python object :param path: A dotted path to a python object or a python object
:type path: :obj:`unicode` or anything :type path: :obj:`unicode` or :obj:`str` or anything
:return: The python object pointed by the dotted path or the python object unchanged :return: The python object pointed by the dotted path or the python object unchanged
""" """
if not isinstance(path, str): # if we got a str, decode it to unicode (normally it should only contain ascii)
if isinstance(path, six.binary_type):
path = path.decode("utf-8")
# if path is not an unicode, return it unchanged (may be it is already the attribute to import)
if not isinstance(path, six.text_type):
return path return path
if "." not in path: if u"." not in path:
ValueError("%r should be of the form `module.attr` and we just got `attr`" % path) ValueError("%r should be of the form `module.attr` and we just got `attr`" % path)
module, attr = path.rsplit('.', 1) module, attr = path.rsplit(u'.', 1)
try: try:
return getattr(import_module(module), attr) return getattr(import_module(module), attr)
except ImportError: except ImportError: