diff options
author | Nathaniel Manista <nathaniel@google.com> | 2016-08-10 17:10:53 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-10 17:10:53 -0700 |
commit | 5d08ba40a0c6ccb9717102d1fcc3717ec5026203 (patch) | |
tree | 4f35abee6c70f2ab5dcac9676abb132c4d45937e | |
parent | 380b3e1c0a8b99fcb8a8d48218d0ec0baa9948af (diff) | |
parent | a10eb17fbaf6c092e9f7f9d5fd3f381b848a6d03 (diff) | |
download | oauth2client-5d08ba40a0c6ccb9717102d1fcc3717ec5026203.tar.gz |
Merge pull request #608 from dhermes/remove-line-continuations
Remove backslash line continuations.
-rw-r--r-- | oauth2client/contrib/django_util/__init__.py | 4 | ||||
-rw-r--r-- | tests/contrib/django_util/test_views.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oauth2client/contrib/django_util/__init__.py b/oauth2client/contrib/django_util/__init__.py index b91b54f..c27ded2 100644 --- a/oauth2client/contrib/django_util/__init__.py +++ b/oauth2client/contrib/django_util/__init__.py @@ -335,8 +335,8 @@ class OAuth2Settings(object): self.request_prefix = getattr(settings_instance, 'GOOGLE_OAUTH2_REQUEST_ATTRIBUTE', GOOGLE_OAUTH2_REQUEST_ATTRIBUTE) - self.client_id, self.client_secret = \ - _get_oauth2_client_id_and_secret(settings_instance) + info = _get_oauth2_client_id_and_secret(settings_instance) + self.client_id, self.client_secret = info if ('django.contrib.sessions.middleware.SessionMiddleware' not in settings_instance.MIDDLEWARE_CLASSES): diff --git a/tests/contrib/django_util/test_views.py b/tests/contrib/django_util/test_views.py index df0d11c..08ef0e8 100644 --- a/tests/contrib/django_util/test_views.py +++ b/tests/contrib/django_util/test_views.py @@ -197,8 +197,8 @@ class Oauth2CallbackTest(TestWithDjangoEnvironment): state=json.dumps(self.fake_state), redirect_uri=request.build_absolute_uri('oauth2/oauth2callback')) - self.session['google_oauth2_flow_{0}'.format(self.CSRF_TOKEN)] \ - = pickle.dumps(flow) + session_key = 'google_oauth2_flow_{0}'.format(self.CSRF_TOKEN) + self.session[session_key] = pickle.dumps(flow) def local_throws(code): raise FlowExchangeError('test') |