Merge ~bjornt/django-piston3:reformat into django-piston3:master

[Björn Tillenius]

Reformat due to new black version.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b reformat lp:~bjornt/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: 5cf3b205ff001510f46a857954afb97c60685cfe

review: Approve

[Alberto Donato (ack)]

review: Approve

diff --git a/piston3/authentication.py b/piston3/authentication.py
index 474d6b6..a5ee0da 100644
--- a/piston3/authentication.py
+++ b/piston3/authentication.py
@@ -88,7 +88,7 @@ class HttpBasicAuthentication(object):
         return resp
 
     def __repr__(self):
-        return u"<HTTPBasic: realm=%s>" % self.realm
+        return "<HTTPBasic: realm=%s>" % self.realm
 
 
 class HttpBasicSimple(HttpBasicAuthentication):
@@ -104,8 +104,7 @@ class HttpBasicSimple(HttpBasicAuthentication):
 
 
 def load_data_store():
-    """Load data store for OAuth Consumers, Tokens, Nonces and Resources
-    """
+    """Load data store for OAuth Consumers, Tokens, Nonces and Resources"""
     path = getattr(settings, "OAUTH_DATA_STORE", "piston3.store.DataStore")
 
     # stolen from django.contrib.auth.load_backend
diff --git a/piston3/doc.py b/piston3/doc.py
index ba8d412..8efc9c4 100644
--- a/piston3/doc.py
+++ b/piston3/doc.py
@@ -151,7 +151,7 @@ class HandlerDocumentation(object):
         def _convert(template, params=[]):
             """URI template converter"""
             paths = template % dict([p, "{%s}" % p] for p in params)
-            return u"%s%s" % (get_script_prefix(), paths)
+            return "%s%s" % (get_script_prefix(), paths)
 
         try:
             resource_uri = self.handler.resource_uri()
@@ -187,7 +187,7 @@ class HandlerDocumentation(object):
     resource_uri_template = property(get_resource_uri_template)
 
     def __repr__(self):
-        return u'<Documentation for "%s">' % self.name
+        return '<Documentation for "%s">' % self.name
 
 
 def documentation_view(request):
diff --git a/piston3/emitters.py b/piston3/emitters.py
index 375bef3..d0fa1b6 100644
--- a/piston3/emitters.py
+++ b/piston3/emitters.py
@@ -105,7 +105,7 @@ class Emitter(object):
 
             if thing in self.stack:
                 raise RuntimeError(
-                    u"Circular reference detected while emitting " "response"
+                    "Circular reference detected while emitting " "response"
                 )
 
             self.stack.append(thing)
diff --git a/piston3/managers.py b/piston3/managers.py
index cd36ed5..f90ed45 100644
--- a/piston3/managers.py
+++ b/piston3/managers.py
@@ -6,8 +6,7 @@ SECRET_SIZE = 32
 
 
 class KeyManager(models.Manager):
-    """Add support for random key/secret generation
-    """
+    """Add support for random key/secret generation"""
 
     def generate_random_codes(self):
         key = User.objects.make_random_password(length=KEY_SIZE)
diff --git a/piston3/models.py b/piston3/models.py
index 688fb8b..a845cdd 100644
--- a/piston3/models.py
+++ b/piston3/models.py
@@ -51,7 +51,7 @@ class Nonce(models.Model):
     key = models.CharField(max_length=255)
 
     def __unicode__(self):
-        return u"Nonce %s for %s" % (self.key, self.consumer_key)
+        return "Nonce %s for %s" % (self.key, self.consumer_key)
 
     class Meta:
         # This is mostly useful to speed up Nonces lookups, as the table can
@@ -78,7 +78,7 @@ class Consumer(models.Model):
     objects = ConsumerManager()
 
     def __unicode__(self):
-        return u"Consumer %s with key %s" % (self.name, self.key)
+        return "Consumer %s with key %s" % (self.name, self.key)
 
     def generate_random_codes(self):
         """
@@ -105,7 +105,7 @@ class Consumer(models.Model):
 class Token(models.Model):
     REQUEST = 1
     ACCESS = 2
-    TOKEN_TYPES = ((REQUEST, u"Request"), (ACCESS, u"Access"))
+    TOKEN_TYPES = ((REQUEST, "Request"), (ACCESS, "Access"))
 
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
@@ -129,7 +129,7 @@ class Token(models.Model):
     objects = TokenManager()
 
     def __unicode__(self):
-        return u"%s Token %s for %s" % (
+        return "%s Token %s for %s" % (
             self.get_token_type_display(),
             self.key,
             self.consumer,
diff --git a/piston3/oauth.py b/piston3/oauth.py
index 568cb76..eadc71b 100644
--- a/piston3/oauth.py
+++ b/piston3/oauth.py
@@ -147,7 +147,7 @@ class OAuthToken(object):
 
     @staticmethod
     def from_string(s):
-        """ Returns a token from something like:
+        """Returns a token from something like:
         oauth_token_secret=xxx&oauth_token=xxx
         """
         params = parse_qs(s, keep_blank_values=False)
diff --git a/piston3/utils.py b/piston3/utils.py
index 0d22132..f9f45e1 100644
--- a/piston3/utils.py
+++ b/piston3/utils.py
@@ -24,7 +24,7 @@ def get_version():
 
 
 def format_error(error):
-    return u"Piston/%s (Django %s) crash report:\n\n%s" % (
+    return "Piston/%s (Django %s) crash report:\n\n%s" % (
         get_version(),
         django_version(),
         error,
diff --git a/piston3/validate_jsonp.py b/piston3/validate_jsonp.py
index 4dbc8dc..81be259 100644
--- a/piston3/validate_jsonp.py
+++ b/piston3/validate_jsonp.py
@@ -132,7 +132,7 @@ def is_valid_javascript_identifier(identifier, escape=r"\u", ucd_cat=category):
                 return False
             add_char(segment[4:])
 
-        identifier = u"".join(new)
+        identifier = "".join(new)
 
     if is_reserved_js_word(identifier):
         return False
@@ -155,11 +155,11 @@ def is_valid_javascript_identifier(identifier, escape=r"\u", ucd_cat=category):
 def is_valid_jsonp_callback_value(value):
     """Return whether the given ``value`` can be used as a JSON-P callback."""
 
-    for identifier in value.split(u"."):
+    for identifier in value.split("."):
         while "[" in identifier:
             if not has_valid_array_index(identifier):
                 return False
-            identifier = replace_array_index(u"", identifier)
+            identifier = replace_array_index("", identifier)
         if not is_valid_javascript_identifier(identifier):
             return False
 
diff --git a/tests/test_project/apps/testapp/tests.py b/tests/test_project/apps/testapp/tests.py
index d183439..0fc94af 100644
--- a/tests/test_project/apps/testapp/tests.py
+++ b/tests/test_project/apps/testapp/tests.py
@@ -82,8 +82,7 @@ class OAuthTests(MainTests):
         self.consumer.delete()
 
     def test_handshake(self):
-        """Test the OAuth handshake procedure
-        """
+        """Test the OAuth handshake procedure"""
         oaconsumer = oauth.OAuthConsumer(self.consumer.key, self.consumer.secret)
 
         # Get a request key...
@@ -219,7 +218,8 @@ class MultiXMLTests(MainTests):
         )
         result_xml = ElementTree.fromstring(result.content)
         self.assertCountEqual(
-            [elem.tag for elem in result_xml], ["test1", "test2", "resource_uri"],
+            [elem.tag for elem in result_xml],
+            ["test1", "test2", "resource_uri"],
         )
 
 
diff --git a/tests/tests.py b/tests/tests.py
index f2ff15f..c25072a 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -49,7 +49,7 @@ class ConsumerTest(TestCase):
             return False
 
     def test_create_pending(self):
-        """ Ensure creating a pending Consumer sends proper emails """
+        """Ensure creating a pending Consumer sends proper emails"""
         # Verify if the emails can be sent
         if not self._pre_test_email():
             return
@@ -65,7 +65,7 @@ class ConsumerTest(TestCase):
         self.assertEqual(mail.outbox[0].subject, expected)
 
     def test_delete_consumer(self):
-        """ Ensure deleting a Consumer sends a cancel email """
+        """Ensure deleting a Consumer sends a cancel email"""
 
         # Clear out the outbox before we test for the cancel email.
         mail.outbox = []