Port PR #1004 by tsouvarev

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added Dockerfile to simplify the running of tests (`make docker-tox`)
 
 ### Changed
+- Preserve order of backends in BACKENDSCACHE (port from [#1004](https://github.com/omab/python-social-auth/pull/1004)
+  by tsouvarev)
 - Don't lose custom exception message on raising AuthCanceled (port from [#1062](https://github.com/omab/python-social-auth/pull/1062)
   by dotsbb)
 - Fixed VK backend (port from [#1007](https://github.com/omab/python-social-auth/pull/1007)

social_core/backends/utils.py

@@ -1,10 +1,12 @@
-from ..exceptions import MissingBackend
+from collections import OrderedDict
+
 from .base import BaseAuth
+from ..exceptions import MissingBackend
 from ..utils import module_member, user_is_authenticated
 
 
 # Cache for discovered backends.
-BACKENDSCACHE = {}
+BACKENDSCACHE = OrderedDict()
 
 
 def load_backends(backends, force_load=False):
@@ -27,7 +29,7 @@ def load_backends(backends, force_load=False):
     """
     global BACKENDSCACHE
     if force_load:
-        BACKENDSCACHE = {}
+        BACKENDSCACHE = OrderedDict()
     if not BACKENDSCACHE:
         for auth_backend in backends:
             backend = module_member(auth_backend)

social_core/tests/backends/test_utils.py

@@ -23,8 +23,7 @@ def test_load_backends(self):
             'social_core.backends.flickr.FlickrOAuth'
         ), force_load=True)
         keys = list(loaded_backends.keys())
-        keys.sort()
-        self.assertEqual(keys, ['facebook', 'flickr', 'github'])
+        self.assertEqual(keys, ['github', 'facebook', 'flickr'])
 
         backends = ()
         loaded_backends = load_backends(backends, force_load=True)