Merge pull request #1286 from AndreMiras/feature/tox_flake8_spacing

Fixes linter E203 E231 E261 E302 E303 E305 W291 W293 W391

Author: inclement

pythonforandroid/bdistapk.py

@@ -33,7 +33,6 @@ def initialize_options(self):
         for (option, (source, value)) in option_dict.items():
             setattr(self, option, str(value))
 
-
     def finalize_options(self):
 
         setup_options = self.distribution.get_option_dict('apk')
@@ -133,7 +132,7 @@ def prepare_build_dir(self):
 def _set_user_options():
     # This seems like a silly way to do things, but not sure if there's a
     # better way to pass arbitrary options onwards to p4a
-    user_options = [('requirements=', None, None),]
+    user_options = [('requirements=', None, None), ]
     for i, arg in enumerate(sys.argv):
         if arg.startswith('--'):
             if ('=' in arg or
@@ -144,4 +143,5 @@ def _set_user_options():
 
     BdistAPK.user_options = user_options
 
-_set_user_options()
+
+_set_user_options()

pythonforandroid/bootstraps/empty/__init__.py

@@ -12,4 +12,5 @@ def run_distribute(self):
         print('empty bootstrap has no distribute')
         exit(1)
 
+
 bootstrap = EmptyBootstrap()

pythonforandroid/bootstraps/pygame/__init__.py

@@ -64,7 +64,7 @@ def run_distribute(self):
             shprint(sh.mkdir, '-p', join('private', 'include', 'python2.7'))
 
             shprint(sh.mv, join('libs', arch.arch, 'libpymodules.so'), 'private/')
-            shprint(sh.cp, join('python-install', 'include' , 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
+            shprint(sh.cp, join('python-install', 'include', 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
 
             info('Removing some unwanted files')
             shprint(sh.rm, '-f', join('private', 'lib', 'libpython2.7.so'))
@@ -91,8 +91,8 @@ def run_distribute(self):
                 shprint(sh.rm, '-rf', 'lib-dynload/_ctypes_test.so')
                 shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
-
         self.strip_libraries(arch)
         super(PygameBootstrap, self).run_distribute()
 
+
 bootstrap = PygameBootstrap()

pythonforandroid/bootstraps/pygame/build/build.py

@@ -370,6 +370,7 @@ def make_package(args):
         print('Did you install ant on your system ?')
         sys.exit(-1)
 
+
 def parse_args(args=None):
     import argparse
 

pythonforandroid/bootstraps/pygame/build/buildlib/argparse.py

@@ -95,9 +95,11 @@
 import sys as _sys
 import textwrap as _textwrap
 
+
 def _(s):
     return s
 
+
 try:
     _set = set
 except NameError:
@@ -123,6 +125,7 @@ def _sorted(iterable, reverse=False):
 def _callable(obj):
     return hasattr(obj, '__call__') or hasattr(obj, '__bases__')
 
+
 # silence Python 2.6 buggy warnings about Exception.message
 if _sys.version_info[:2] == (2, 6):
     import warnings
@@ -145,6 +148,7 @@ def _callable(obj):
 # Utility functions and classes
 # =============================
 
+
 class _AttributeHolder(object):
     """Abstract base class that provides __repr__.
 
@@ -1165,6 +1169,7 @@ def __repr__(self):
 # Optional and Positional Parsing
 # ===========================
 
+
 class Namespace(_AttributeHolder):
     """Simple object for storing attributes.
 
@@ -1265,7 +1270,6 @@ def get_default(self, dest):
                 return action.default
         return self._defaults.get(dest, None)
 
-
     # =======================
     # Adding argument actions
     # =======================

pythonforandroid/bootstraps/sdl2/build/build.py

@@ -296,7 +296,7 @@ def make_package(args):
     if args.intent_filters:
         with open(args.intent_filters) as fd:
             args.intent_filters = fd.read()
-    
+
     args.add_activity = args.add_activity or []
 
     args.activity_launch_mode = args.activity_launch_mode or ''
@@ -355,7 +355,6 @@ def make_package(args):
                                   key=LooseVersion)
     build_tools_version = build_tools_versions[-1]
 
-
     render(
         'AndroidManifest.tmpl.xml',
         'src/main/AndroidManifest.xml',
@@ -371,7 +370,6 @@ def make_package(args):
         remove('AndroidManifest.xml')
     shutil.copy(join('src', 'main', 'AndroidManifest.xml'),
                 'AndroidManifest.xml')
-        
 
     render(
         'strings.tmpl.xml',
@@ -402,13 +400,13 @@ def make_package(args):
         'custom_rules.xml',
         args=args)
 
-
     if args.sign:
         render('build.properties', 'build.properties')
     else:
         if exists('build.properties'):
             os.remove('build.properties')
 
+
 def parse_args(args=None):
     global BLACKLIST_PATTERNS, WHITELIST_PATTERNS, PYTHON
     default_android_api = 12

pythonforandroid/bootstraps/service_only/__init__.py

@@ -114,7 +114,6 @@ def run_distribute(self):
                 site_packages_dir = join(abspath(curdir),
                                          site_packages_dir)
 
-
         self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)
         super(ServiceOnlyBootstrap, self).run_distribute()

pythonforandroid/bootstraps/service_only/build/build.py

@@ -53,6 +53,7 @@
 environment = jinja2.Environment(loader=jinja2.FileSystemLoader(
     join(curdir, 'templates')))
 
+
 def render(template, dest, **kwargs):
     '''Using jinja2, render `template` to the filename `dest`, supplying the
 
@@ -104,6 +105,7 @@ def listfiles(d):
         for fn in listfiles(subdir):
             yield fn
 
+
 def make_python_zip():
     '''
     Search for all the python related files, and construct the pythonXX.zip
@@ -120,7 +122,6 @@ def make_python_zip():
     global python_files
     d = realpath(join('private', 'lib', 'python2.7'))
 
-
     def select(fn):
         if is_blacklist(fn):
             return False
@@ -147,6 +148,7 @@ def select(fn):
         zf.write(fn, afn)
     zf.close()
 
+
 def make_tar(tfn, source_dirs, ignore_path=[]):
     '''
     Make a zip file `fn` from the contents of source_dis.
@@ -242,7 +244,6 @@ def make_package(args):
     # if args.dir:
     #     make_tar('assets/public.mp3', [args.dir], args.ignore_path)
 
-
     # # Build.
     # try:
     #     for arg in args.command:
@@ -252,7 +253,6 @@ def make_package(args):
     #     print 'Did you install ant on your system ?'
     #     sys.exit(-1)
 
-
     # Prepare some variables for templating process
 
 #     default_icon = 'templates/kivy-icon.png'

pythonforandroid/bootstraps/webview/__init__.py

@@ -4,6 +4,7 @@
 import glob
 import sh
 
+
 class WebViewBootstrap(Bootstrap):
     name = 'webview'
 
@@ -59,7 +60,7 @@ def run_distribute(self):
 
                 if exists(join('libs', arch.arch, 'libpymodules.so')):
                     shprint(sh.mv, join('libs', arch.arch, 'libpymodules.so'), 'private/')
-                shprint(sh.cp, join('python-install', 'include' , 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
+                shprint(sh.cp, join('python-install', 'include', 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
 
                 info('Removing some unwanted files')
                 shprint(sh.rm, '-f', join('private', 'lib', 'libpython2.7.so'))
@@ -110,9 +111,9 @@ def run_distribute(self):
                 site_packages_dir = join(abspath(curdir),
                                          site_packages_dir)
 
-
         self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)
         super(WebViewBootstrap, self).run_distribute()
 
+
 bootstrap = WebViewBootstrap()

pythonforandroid/bootstraps/webview/build/build.py

@@ -38,7 +38,7 @@
 
     # pyc/py
     '*.pyc',
-    # '*.py',  
+    # '*.py',
 
     # temp files
     '~',
@@ -54,6 +54,7 @@
 environment = jinja2.Environment(loader=jinja2.FileSystemLoader(
     join(curdir, 'templates')))
 
+
 def render(template, dest, **kwargs):
     '''Using jinja2, render `template` to the filename `dest`, supplying the
 
@@ -105,6 +106,7 @@ def listfiles(d):
         for fn in listfiles(subdir):
             yield fn
 
+
 def make_python_zip():
     '''
     Search for all the python related files, and construct the pythonXX.zip
@@ -121,7 +123,6 @@ def make_python_zip():
     global python_files
     d = realpath(join('private', 'lib', 'python2.7'))
 
-
     def select(fn):
         if is_blacklist(fn):
             return False
@@ -148,6 +149,7 @@ def select(fn):
         zf.write(fn, afn)
     zf.close()
 
+
 def make_tar(tfn, source_dirs, ignore_path=[]):
     '''
     Make a zip file `fn` from the contents of source_dis.
@@ -244,7 +246,6 @@ def make_package(args):
     # if args.dir:
     #     make_tar('assets/public.mp3', [args.dir], args.ignore_path)
 
-
     # # Build.
     # try:
     #     for arg in args.command:
@@ -254,7 +255,6 @@ def make_package(args):
     #     print 'Did you install ant on your system ?'
     #     sys.exit(-1)
 
-
     # Prepare some variables for templating process
 
     default_icon = 'templates/kivy-icon.png'