Merge branch 'elep'

[django-cas-provider.git] / cas_provider / __init__.py

diff --git a/cas_provider/__init__.py b/cas_provider/__init__.py
index 449c7b6..ff16364 100644 (file)
--- a/cas_provider/__init__.py
+++ b/cas_provider/__init__.py
@@ -1,14 +1,16 @@
+from __future__ import unicode_literals
+

 from django.conf import settings
 
 __all__ = []
 
 _DEFAULTS = {
     'CAS_TICKET_EXPIRATION': 5, # In minutes
 from django.conf import settings
 
 __all__ = []
 
 _DEFAULTS = {
     'CAS_TICKET_EXPIRATION': 5, # In minutes

-    'CAS_CUSTOM_ATTRIBUTES_CALLBACK': None,

     'CAS_CUSTOM_ATTRIBUTES_FORMATER': 'cas_provider.attribute_formatters.jasig',
     'CAS_CUSTOM_ATTRIBUTES_FORMATER': 'cas_provider.attribute_formatters.jasig',

+    'CAS_AUTO_REDIRECT_AFTER_LOGOUT': False,

 }
 
 }
 

-for key, value in _DEFAULTS.iteritems():
+for key, value in _DEFAULTS.items():

     try:
         getattr(settings, key)
     except AttributeError:
     try:
         getattr(settings, key)
     except AttributeError: