flake8 cleanup of ./setup*

setup-release.py

@@ -8,10 +8,14 @@ Usage (Windows):
      python setup.py py2exe
 """
 
-import sys, os, shutil, re
 from setuptools import setup
-from lib.version import ELECTRUM_VERSION as version
+import os
+import re
+import shutil
+import sys
+
 from lib.util import print_error
+from lib.version import ELECTRUM_VERSION as version
 
 
 name = "Electrum"

setup.py

@@ -3,7 +3,11 @@
 # python setup.py sdist --format=zip,gztar
 
 from setuptools import setup
-import os, sys, platform, imp
+import os
+import sys
+import platform
+import imp
+
 
 version = imp.load_source('version', 'lib/version.py')
 util = imp.load_source('version', 'lib/util.py')
@@ -13,8 +17,7 @@ if sys.version_info[:3] < (2,6,0):
 
 usr_share = '/usr/share'
 if not os.access(usr_share, os.W_OK):
-    usr_share = os.getenv("XDG_DATA_HOME",
+    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
-                           os.path.join(os.getenv("HOME"), ".local", "share"))
 
 data_files = []
 if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
@@ -47,41 +50,46 @@ data_files += [
 ]
 
 
-setup(name = "Electrum",
+setup(
+    name="Electrum",
     version=version.ELECTRUM_VERSION,
     install_requires=['slowaes', 'ecdsa>=0.9'],
-    package_dir = {'electrum': 'lib', 'electrum_gui': 'gui', 'electrum_plugins':'plugins'},
+    package_dir={
+        'electrum': 'lib',
+        'electrum_gui': 'gui',
+        'electrum_plugins': 'plugins',
+    },
     scripts=['electrum'],
     data_files=data_files,
-    py_modules = ['electrum.account',
+    py_modules=[
+        'electrum.account',
         'electrum.bitcoin',
         'electrum.blockchain',
+        'electrum.bmp',
         'electrum.commands',
+        'electrum.i18n',
         'electrum.interface',
         'electrum.mnemonic',
         'electrum.msqr',
         'electrum.network',
+        'electrum.plugins',
+        'electrum.pyqrnative',
         'electrum.simple_config',
         'electrum.socks',
         'electrum.transaction',
         'electrum.util',
-                  'electrum.version',
         'electrum.verifier',
+        'electrum.version',
         'electrum.wallet',
         'electrum.wallet_bitkey',
         'electrum.wallet_factory',
-                  'electrum.bmp',
-                  'electrum.i18n',
-                  'electrum.pyqrnative',
-                  'electrum.plugins',
         'electrum_gui.gtk',
-                  'electrum_gui.text',
         'electrum_gui.qt.__init__',
         'electrum_gui.qt.amountedit',
         'electrum_gui.qt.console',
         'electrum_gui.qt.history_widget',
-                  'electrum_gui.qt.installwizard',
         'electrum_gui.qt.icons_rc',
+        'electrum_gui.qt.installwizard',
         'electrum_gui.qt.lite_window',
         'electrum_gui.qt.main_window',
         'electrum_gui.qt.network_dialog',
@@ -93,6 +101,7 @@ setup(name = "Electrum",
         'electrum_gui.qt.util',
         'electrum_gui.qt.version_getter',
         'electrum_gui.stdio',
+        'electrum_gui.text',
         'electrum_plugins.aliases',
         'electrum_plugins.exchange_rate',
         'electrum_plugins.labels',
@@ -107,5 +116,3 @@ setup(name = "Electrum",
     url="http://electrum.org",
     long_description="""Lightweight Bitcoin Wallet"""
 )
-
-