mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2025-07-27 07:59:46 +03:00
Merge a47083824d
into 644c4d28e1
This commit is contained in:
commit
7a79d64f3e
|
@ -2,14 +2,16 @@ language: python
|
||||||
python:
|
python:
|
||||||
- "2.6"
|
- "2.6"
|
||||||
- "2.7"
|
- "2.7"
|
||||||
|
- "3.3"
|
||||||
|
- "3.4"
|
||||||
env:
|
env:
|
||||||
- DJANGO=1.5.10
|
- DJANGO=1.5.10
|
||||||
- DJANGO=1.6.7
|
- DJANGO=1.6.7
|
||||||
- DJANGO=1.7
|
- DJANGO=1.7.1
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
exclude:
|
||||||
- python: "2.6"
|
- python: "2.6"
|
||||||
env: DJANGO=1.7
|
env: DJANGO=1.7.1
|
||||||
install:
|
install:
|
||||||
- pip install -q Django==$DJANGO --use-mirrors
|
- pip install -q Django==$DJANGO --use-mirrors
|
||||||
- pip install coveralls
|
- pip install coveralls
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
from six import string_types
|
||||||
from django.utils.importlib import import_module
|
from django.utils.importlib import import_module
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,7 +6,7 @@ def import_callable(path_or_callable):
|
||||||
if hasattr(path_or_callable, '__call__'):
|
if hasattr(path_or_callable, '__call__'):
|
||||||
return path_or_callable
|
return path_or_callable
|
||||||
else:
|
else:
|
||||||
assert isinstance(path_or_callable, (str, unicode))
|
assert isinstance(path_or_callable, string_types)
|
||||||
package, attr = path_or_callable.rsplit('.', 1)
|
package, attr = path_or_callable.rsplit('.', 1)
|
||||||
return getattr(import_module(package), attr)
|
return getattr(import_module(package), attr)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user