Merge pull request #406 from WyseNynja/flake8_contrib

Flake8 contrib

contrib/build-wine/build-electrum-git.sh

@@ -44,7 +44,7 @@ cp electrum-git/LICENCE .
 # Build Qt resources
 wine $WINEPREFIX/drive_c/Python26/Lib/site-packages/PyQt4/pyrcc4.exe C:/electrum/icons.qrc -o C:/electrum/lib/icons_rc.py
 
-# Copy ZBar libraries to electrum    
+# Copy ZBar libraries to electrum
 #cp "$WINEPREFIX/drive_c/Program Files (x86)/ZBar/bin/"*.dll "$WINEPREFIX/drive_c/electrum/"
 
 cd ..

contrib/build-wine/build-electrum.sh

@@ -23,7 +23,7 @@ rm -rf $WINEPREFIX/drive_c/electrum
 cp electrum/LICENCE .
 mv electrum $WINEPREFIX/drive_c
 
-# Copy ZBar libraries to electrum    
+# Copy ZBar libraries to electrum
 #cp "$WINEPREFIX/drive_c/Program Files (x86)/ZBar/bin/"*.dll "$WINEPREFIX/drive_c/electrum/"
 
 cd ..

contrib/build-wine/deterministic.spec

@@ -5,7 +5,7 @@ a = Analysis(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui
               'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py',
               'lib/bitcoin.py'
               ],
-             hiddenimports=["lib","gui"], 
+             hiddenimports=["lib","gui"],
              pathex=['lib:gui:plugins'],
              hookspath=None)
 

contrib/build-wine/electrum.nsi

@@ -12,7 +12,7 @@
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\Electrum"
-  
+
   ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\Electrum" ""
 
@@ -33,22 +33,22 @@
   ;!insertmacro MUI_PAGE_LICENSE "tmp/LICENCE"
   ;!insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
-  
+
   ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum" 
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  
+
   ;!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-  
+
   !insertmacro MUI_PAGE_INSTFILES
-  
+
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
 
 ;--------------------------------
 ;Languages
- 
+
   !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
@@ -57,13 +57,13 @@
 Section
 
   SetOutPath "$INSTDIR"
-  
+
   ;ADD YOUR OWN FILES HERE...
   file /r dist\electrum\*.*
-  
+
   ;Store installation folder
   WriteRegStr HKCU "Software\Electrum" "" $INSTDIR
-  
+
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -84,7 +84,7 @@ SectionEnd
   ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
   ;!insertmacro MUI_FUNCTION_DESCRIPTION_END
- 
+
 ;--------------------------------
 ;Uninstaller Section
 
@@ -94,11 +94,11 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\*.*"
 
   RMDir "$INSTDIR"
-  
+
   Delete "$DESKTOP\Electrum.lnk"
   Delete "$SMPROGRAMS\Electrum\*.*"
   RmDir  "$SMPROGRAMS\Electrum"
-    
+
   DeleteRegKey /ifempty HKCU "Software\Electrum"
 
 SectionEnd

contrib/make_download

@@ -1,31 +1,32 @@
 #!/usr/bin/python
 import sys
-string = sys.stdin.read()
+import hashlib
+import os
 
-import hashlib, os
 from versions import version, version_win, version_mac
 
-_tgz="Electrum-%s.tar.gz"%version
-_zip="Electrum-%s.zip"%version
+string = sys.stdin.read()
 
-_mac="electrum-%s.dmg"%version_mac
-_win="electrum-%s.exe"%version_win
-_win_setup="electrum-%s-setup.exe"%version_win
-_win_portable="electrum-%s-portable.exe"%version_win
+_tgz = "Electrum-%s.tar.gz" % version
+_zip = "Electrum-%s.zip" % version
+
+_mac = "electrum-%s.dmg" % version_mac
+_win = "electrum-%s.exe" % version_win
+_win_setup = "electrum-%s-setup.exe" % version_win
+_win_portable = "electrum-%s-portable.exe" % version_win
 
 md5_tgz = hashlib.md5(file('dist/'+_tgz, 'r').read()).digest().encode('hex')
 md5_zip = hashlib.md5(file('dist/'+_zip, 'r').read()).digest().encode('hex')
 
 for n in [_win, _win_portable, _win_setup, _mac]:
-    if not os.path.exists("binaries/%s"%n):
-        os.system("wget http://download.electrum.org/download/%s -O binaries/%s"%(n,n))
+    if not os.path.exists("binaries/%s" % n):
+        os.system("wget http://download.electrum.org/download/%s -O binaries/%s" % (n, n))
 
 md5_mac = hashlib.md5(file('binaries/'+_mac, 'r').read()).digest().encode('hex')
 md5_win = hashlib.md5(file('binaries/'+_win, 'r').read()).digest().encode('hex')
 md5_win_setup = hashlib.md5(file('binaries/'+_win_setup, 'r').read()).digest().encode('hex')
 md5_win_portable = hashlib.md5(file('binaries/'+_win_portable, 'r').read()).digest().encode('hex')
 
-
 string = string.replace("##VERSION##", version)
 string = string.replace("##VERSION_WIN##", version_win)
 string = string.replace("##VERSION_MAC##", version_mac)
@@ -36,8 +37,4 @@ string = string.replace("##md5_win##", md5_win)
 string = string.replace("##md5_win_setup##", md5_win_setup)
 string = string.replace("##md5_win_portable##", md5_win_portable)
 
-
 print string
-
-
-#