Fixed PEP8 style issues

4 files changed, 56 insertions, 53 deletions

diff --git a/doc/conf.py b/doc/conf.py
index f2e66a7..c2b4a7b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,23 +11,24 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+# import sys
+# import os
 import rsa
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo',
-    'sphinx.ext.coverage', 'sphinx.ext.pngmath']
+              'sphinx.ext.coverage', 'sphinx.ext.pngmath']
 
 # I would like to add 'sphinx.ext.viewcode', but it causes a UnicodeDecodeError
 
@@ -62,33 +63,33 @@ language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
@@ -100,26 +101,26 @@ html_theme = 'sphinxdoc'
 # 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
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -128,86 +129,85 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Python-RSAdoc'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+# latex_paper_size = 'letter'
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Python-RSA.tex', u'Python-RSA Documentation',
-   u'Sybren A. Stüvel', 'manual'),
+    ('index', 'Python-RSA.tex', u'Python-RSA Documentation',
+     u'Sybren A. Stüvel', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+# latex_preamble = ''
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------
@@ -220,4 +220,3 @@ man_pages = [
 ]
 
 todo_include_todos = True
-
diff --git a/rsa/key.py b/rsa/key.py
index 0eddcde..f49a102 100644
--- a/rsa/key.py
+++ b/rsa/key.py
@@ -441,16 +441,16 @@ class PrivateKey(AbstractKey):
         # ASN.1 contents of DER encoded private key:
         #
         # RSAPrivateKey ::= SEQUENCE {
-        #     version           Version, 
+        #     version           Version,
         #     modulus           INTEGER,  -- n
         #     publicExponent    INTEGER,  -- e
         #     privateExponent   INTEGER,  -- d
         #     prime1            INTEGER,  -- p
         #     prime2            INTEGER,  -- q
         #     exponent1         INTEGER,  -- d mod (p-1)
-        #     exponent2         INTEGER,  -- d mod (q-1) 
+        #     exponent2         INTEGER,  -- d mod (q-1)
         #     coefficient       INTEGER,  -- (inverse of q) mod p
-        #     otherPrimeInfos   OtherPrimeInfos OPTIONAL 
+        #     otherPrimeInfos   OtherPrimeInfos OPTIONAL
         # }
 
         if priv[0] != 0:
diff --git a/rsa/prime.py b/rsa/prime.py
index 4763d16..2ac1ffe 100644
--- a/rsa/prime.py
+++ b/rsa/prime.py
@@ -20,10 +20,10 @@ Implementation based on the book Algorithm Design by Michael T. Goodrich and
 Roberto Tamassia, 2002.
 """
 
-__all__ = ['getprime', 'are_relatively_prime']
-
 import rsa.randnum
 
+__all__ = ['getprime', 'are_relatively_prime']
+
 
 def gcd(p, q):
     """Returns the greatest common divisor of p and q
@@ -47,7 +47,8 @@ def jacobi(a, b):
     assert a > 0
     assert b > 0
 
-    if a == 0: return 0
+    if a == 0:
+        return 0
     result = 1
     while a > 1:
         if a & 1:
@@ -58,7 +59,8 @@ def jacobi(a, b):
             if (((b * b) - 1) >> 3) & 1:
                 result = -result
             a >>= 1
-    if a == 0: return 0
+    if a == 0:
+        return 0
     return result
 
 
@@ -69,7 +71,8 @@ def jacobi_witness(x, n):
 
     f = pow(x, n >> 1, n)
 
-    if j == f: return False
+    if j == f:
+        return False
     return True
 
 
@@ -93,7 +96,8 @@ def randomized_primality_testing(n, k):
 
     for _ in range(k):
         x = rsa.randnum.randint(n - 1)
-        if jacobi_witness(x, n): return False
+        if jacobi_witness(x, n):
+            return False
 
     return True
 
diff --git a/rsa/util.py b/rsa/util.py
index df3f6ef..1958161 100644
--- a/rsa/util.py
+++ b/rsa/util.py
@@ -50,7 +50,7 @@ def private_to_public():
 
     # Read the input data
     if cli.infilename:
-        print('Reading private key from %s in %s format' % \
+        print('Reading private key from %s in %s format' %
               (cli.infilename, cli.inform), file=sys.stderr)
         with open(cli.infilename, 'rb') as infile:
             in_data = infile.read()
@@ -69,7 +69,7 @@ def private_to_public():
     out_data = pub_key.save_pkcs1(cli.outform)
 
     if cli.outfilename:
-        print('Writing public key to %s in %s format' % \
+        print('Writing public key to %s in %s format' %
               (cli.outfilename, cli.outform), file=sys.stderr)
         with open(cli.outfilename, 'wb') as outfile:
             outfile.write(out_data)