Blacken proto-pus (#42)

Author: software-dov

packages/proto-plus/docs/conf.py

@@ -14,19 +14,20 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('..'))
+
+sys.path.insert(0, os.path.abspath(".."))
 
 
 # -- Project information -----------------------------------------------------
 
-project = 'Proto Plus for Python'
-copyright = '2018, Google LLC'
-author = 'Luke Sneeringer'
+project = "Proto Plus for Python"
+copyright = "2018, Google LLC"
+author = "Luke Sneeringer"
 
 # The short X.Y version
-version = '0.1.0'
+version = "0.1.0"
 # The full version, including alpha/beta/rc tags
-release = '0.1.0'
+release = "0.1.0"
 
 
 # -- General configuration ---------------------------------------------------
@@ -39,24 +40,24 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages',
-    'sphinx.ext.napoleon',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.githubpages",
+    "sphinx.ext.napoleon",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -68,18 +69,18 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -106,7 +107,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'proto-plus-python'
+htmlhelp_basename = "proto-plus-python"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -115,15 +116,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignmentAPIClientGeneratorforPython
     #
     # 'figure_align': 'htbp',
@@ -133,8 +131,13 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'proto-plus-python.tex', 'Proto Plus for Python Documentation',
-     'Luke Sneeringer', 'manual'),
+    (
+        master_doc,
+        "proto-plus-python.tex",
+        "Proto Plus for Python Documentation",
+        "Luke Sneeringer",
+        "manual",
+    ),
 ]
 
 
@@ -143,8 +146,13 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'proto-plus-python', 'Proto Plus for Python Documentation',
-     [author], 1)
+    (
+        master_doc,
+        "proto-plus-python",
+        "Proto Plus for Python Documentation",
+        [author],
+        1,
+    )
 ]
 
 
@@ -154,9 +162,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'proto-plus-python', 'Proto Plus for Python Documentation',
-     author, 'proto-plus-python', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "proto-plus-python",
+        "Proto Plus for Python Documentation",
+        author,
+        "proto-plus-python",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 
@@ -165,4 +179,4 @@
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/3/': None}
+intersphinx_mapping = {"https://docs.python.org/3/": None}

packages/proto-plus/noxfile.py

@@ -18,39 +18,47 @@
 import nox
 
 
-@nox.session(python=['3.5', '3.6', '3.7'])
-def unit(session, proto='python'):
+@nox.session(python=["3.5", "3.6", "3.7"])
+def unit(session, proto="python"):
     """Run the unit test suite."""
 
-    session.env['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = proto
-    session.install('coverage', 'pytest', 'pytest-cov')
-    session.install('-e', '.')
+    session.env["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = proto
+    session.install("coverage", "pytest", "pytest-cov")
+    session.install("-e", ".")
 
     session.run(
-        'py.test',
-        '-W=error',
-        '--quiet',
-        '--cov=proto',
-        '--cov-config=.coveragerc',
-        '--cov-report=term',
-        '--cov-report=html',
-        os.path.join('tests', ''),
+        "py.test",
+        "-W=error",
+        "--quiet",
+        "--cov=proto",
+        "--cov-config=.coveragerc",
+        "--cov-report=term",
+        "--cov-report=html",
+        os.path.join("tests", ""),
     )
 
 
-@nox.session(python=['3.5', '3.6', '3.7'])
+@nox.session(python=["3.5", "3.6", "3.7"])
 def unitcpp(session):
-    return unit(session, proto='cpp')
+    return unit(session, proto="cpp")
 
 
-@nox.session(python='3.6')
+@nox.session(python="3.6")
 def docs(session):
     """Build the docs."""
 
-    session.install('sphinx', 'sphinx_rtd_theme')
-    session.install('.')
+    session.install("sphinx", "sphinx_rtd_theme")
+    session.install(".")
 
     # Build the docs!
-    session.run('rm', '-rf', 'docs/_build/')
-    session.run('sphinx-build', '-W', '-b', 'html', '-d',
-                'docs/_build/doctrees', 'docs/', 'docs/_build/html/')
+    session.run("rm", "-rf", "docs/_build/")
+    session.run(
+        "sphinx-build",
+        "-W",
+        "-b",
+        "html",
+        "-d",
+        "docs/_build/doctrees",
+        "docs/",
+        "docs/_build/html/",
+    )

packages/proto-plus/proto/__init__.py

@@ -42,30 +42,29 @@
 
 
 __all__ = (
-    'Enum',
-    'Field',
-    'MapField',
-    'RepeatedField',
-    'Marshal',
-    'Message',
-    'module',
-
+    "Enum",
+    "Field",
+    "MapField",
+    "RepeatedField",
+    "Marshal",
+    "Message",
+    "module",
     # Expose the types directly.
-    'DOUBLE',
-    'FLOAT',
-    'INT64',
-    'UINT64',
-    'INT32',
-    'FIXED64',
-    'FIXED32',
-    'BOOL',
-    'STRING',
-    'MESSAGE',
-    'BYTES',
-    'UINT32',
-    'ENUM',
-    'SFIXED32',
-    'SFIXED64',
-    'SINT32',
-    'SINT64',
+    "DOUBLE",
+    "FLOAT",
+    "INT64",
+    "UINT64",
+    "INT32",
+    "FIXED64",
+    "FIXED32",
+    "BOOL",
+    "STRING",
+    "MESSAGE",
+    "BYTES",
+    "UINT32",
+    "ENUM",
+    "SFIXED32",
+    "SFIXED64",
+    "SINT32",
+    "SINT64",
 )

packages/proto-plus/proto/_file_info.py

@@ -24,8 +24,11 @@
 from proto.marshal.rules.message import MessageRule
 
 
-class _FileInfo(collections.namedtuple(
-        '_FileInfo', ['descriptor', 'messages', 'enums', 'name', 'nested'])):
+class _FileInfo(
+    collections.namedtuple(
+        "_FileInfo", ["descriptor", "messages", "enums", "name", "nested"]
+    )
+):
     registry = {}  # Mapping[str, '_FileInfo']
 
     def generate_file_pb(self):
@@ -44,9 +47,8 @@ def generate_file_pb(self):
         # Salt the filename in the descriptor.
         # This allows re-use of the filename by other proto messages if
         # needed (e.g. if __all__ is not used).
-        self.descriptor.name = '{prefix}_{salt}.proto'.format(
-            prefix=self.descriptor.name[:-6],
-            salt=str(uuid.uuid4())[0:8],
+        self.descriptor.name = "{prefix}_{salt}.proto".format(
+            prefix=self.descriptor.name[:-6], salt=str(uuid.uuid4())[0:8],
         )
 
         # Add the file descriptor.
@@ -62,7 +64,7 @@ def generate_file_pb(self):
             pb_message = reflection.GeneratedProtocolMessageType(
                 descriptor.name,
                 (message.Message,),
-                {'DESCRIPTOR': descriptor, '__module__': None},
+                {"DESCRIPTOR": descriptor, "__module__": None},
             )
 
             # Register the message with the marshal so it is wrapped
@@ -73,8 +75,7 @@ def generate_file_pb(self):
             # message subclass, which is what we need to use.
             proto_plus_message._meta._pb = pb_message
             proto_plus_message._meta.marshal.register(
-                pb_message,
-                MessageRule(pb_message, proto_plus_message)
+                pb_message, MessageRule(pb_message, proto_plus_message)
             )
 
             # Iterate over any fields on the message and, if their type
@@ -122,10 +123,8 @@ def ready(self, new_class):
         # manifest has been populated.
         module = inspect.getmodule(new_class)
         manifest = frozenset()
-        if hasattr(module, '__protobuf__'):
-            manifest = module.__protobuf__.manifest.difference(
-                {new_class.__name__},
-            )
+        if hasattr(module, "__protobuf__"):
+            manifest = module.__protobuf__.manifest.difference({new_class.__name__},)
         if not all([hasattr(module, i) for i in manifest]):
             return False
 

packages/proto-plus/proto/_package_info.py

@@ -32,12 +32,12 @@ def compile(name, attrs):
     """
     # Pull a reference to the module where this class is being
     # declared.
-    module = sys.modules.get(attrs.get('__module__'))
-    proto_module = getattr(module, '__protobuf__', object())
+    module = sys.modules.get(attrs.get("__module__"))
+    proto_module = getattr(module, "__protobuf__", object())
 
     # A package should be present; get the marshal from there.
-    package = getattr(proto_module, 'package', '')
-    marshal = Marshal(name=getattr(proto_module, 'marshal', package))
+    package = getattr(proto_module, "package", "")
+    marshal = Marshal(name=getattr(proto_module, "marshal", package))
 
     # Done; return the data.
     return (package, marshal)

packages/proto-plus/proto/enums.py

@@ -20,6 +20,7 @@
 
 class ProtoEnumMeta(enum.EnumMeta):
     """A metaclass for building and registering protobuf enums."""
+
     def __new__(mcls, name, bases, attrs):
         # Do not do any special behavior for `proto.Enum` itself.
         if bases[0] == enum.IntEnum:
@@ -41,4 +42,5 @@ def __new__(mcls, name, bases, attrs):
 
 class Enum(enum.IntEnum, metaclass=ProtoEnumMeta):
     """A enum object that also builds a protobuf enum descriptor."""
+
     pass