Merge remote-tracking branch 'origin/master'

accounts/pipeline.py

@@ -27,6 +27,7 @@ from social.exceptions import AuthForbidden
 from accounts.models import send_notification_email, VerifiedEmail
 from weblate import appsettings
 
+
 def get_backend_name(strategy):
     '''
     Wrapper to provide compatibility with different versions

pylint.rc

@@ -35,7 +35,7 @@ disable=C0111,I0011,I0012,W0704,W0142,W0232,W0613,W0702,R0201,E1101,E1120,E1103,
 
 # Set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html
-output-format=parseable
+#output-format=parseable
 
 # Include message's id in output
 include-ids=yes

weblate/settings_example.py

@@ -171,7 +171,8 @@ AUTHENTICATION_BACKENDS = (
     'social.backends.email.EmailAuth',
     #'social.backends.github.GithubOAuth2',
     #'social.backends.suse.OpenSUSEOpenId',
-    'social.apps.django_app.utils.BackendWrapper',
+    # Needed for Django 1.6:
+    #'social.apps.django_app.utils.BackendWrapper',
     'accounts.auth.WeblateUserBackend',
 )