conflict fix

python-social-auth · Mar 10, 2024 · cb7bed5 · cb7bed5
2 parents c6c2209 + 2244c80
commit cb7bed5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/social_cherrypy/strategy.py b/social_cherrypy/strategy.py
@@ -60,5 +60,5 @@ def build_absolute_uri(self, path=None):
         return cherrypy.url(path or "")
 
     def is_response(self, value):
-        return (isinstance(value, str) or
+        return (isinstance(value, str) or  # fmt: skip
                 isinstance(value, cherrypy.CherryPyException))
diff --git a/social_cherrypy/views.py b/social_cherrypy/views.py
@@ -21,7 +21,8 @@ def complete(self, backend, *args, **kwargs):
 
     @cherrypy.expose
     @psa()
-    def disconnect(self, backend, association_id=None, csrfmiddlewaretoken=None):
+    def disconnect(self, backend, association_id=None,  # fmt: skip
+                   csrfmiddlewaretoken=None):
         user = getattr(cherrypy.request, "user", None)
         return do_disconnect(self.backend, user, association_id)