Merge pull request #11 from udacity/make_faq_settings_translatable

[osqa.git] / forum / authentication / __init__.py

diff --git a/forum/authentication/__init__.py b/forum/authentication/__init__.py
index 08ea03fd0575aa799464ade7274b8625223b6b6b..79c47a8dd2e05908b96e2e7ea438a2cf72372576 100644 (file)
--- a/forum/authentication/__init__.py
+++ b/forum/authentication/__init__.py
@@ -8,7 +8,8 @@ class ConsumerAndContext:
         self.id = id
         self._consumer = consumer
 
-        context.id = id
+        if context:
+            context.id = id
         self.context = context
 
     @property
@@ -27,31 +28,7 @@ contexts = dict([
         ])
 
 AUTH_PROVIDERS = dict([
-            (name, ConsumerAndContext(name, consumers[name], contexts[name])) for name in consumers.keys()
-            if name in contexts
+            (name, ConsumerAndContext(name, consumers[name], contexts.get(name, None))) for name in consumers.keys()
         ])
 
 
-#todo: probably this don't belong here, also this post_stored routine needs a lot of work
-user_logged_in = django.dispatch.Signal(providing_args=["user", "old_session"])
-
-#def post_stored_anonymous_content(user,old_session,**kwargs):
-#    from forum.models import AnonymousQuestion, AnonymousAnswer
-#    aq_list = AnonymousQuestion.objects.filter(session_key = old_session)
-#    aa_list = AnonymousAnswer.objects.filter(session_key = old_session)
-#    import settings
-#    if settings.EMAIL_VALIDATION == 'on':#add user to the record
-#        for aq in aq_list:
-#            aq.author = user
-#            aq.save()
-#        for aa in aa_list:
-#            aa.author = user
-#            aa.save()
-#        #maybe add pending posts message?
-#    else: #just publish the questions
-#        for aq in aq_list:
-#            aq.publish(user)
-#        for aa in aa_list:
-#            aa.publish(user)
-#
-#user_logged_in.connect(post_stored_anonymous_content)
\ No newline at end of file