flake8

setup.py

@@ -6,7 +6,7 @@ from distutils.core import setup
 from pysollib.settings import VERSION
 from pysollib.settings import PACKAGE_URL
 if os.name == 'nt':
-    import py2exe
+    eval('import py2exe')
 
 if os.name == 'posix':
     data_dir = 'share/PySolFC'
@@ -24,7 +24,7 @@ ddirs = [
     'themes',
     'tcl',
     ]
-for s in file('MANIFEST.in'):
+for s in open('MANIFEST.in'):
     if s.startswith('graft data/cardset-'):
         ddirs.append(s[11:].strip())
 
@@ -50,8 +50,8 @@ if os.name == 'posix':
     data_files.append((data_dir, ['data/pysolfc.glade']))
     data_files.append(('share/applications', ['data/pysol.desktop']))
 
-##from pprint import pprint; pprint(data_files)
-##import sys; sys.exit()
+# from pprint import pprint; pprint(data_files)
+# import sys; sys.exit()
 
 long_description = '''\
 PySolFC is a collection of more than 1000 solitaire card games.

setup_osx.py

@@ -3,8 +3,10 @@ Usage:
     python setup.py py2app
 """
 
-import os, sys
+import os
+import sys
 import shutil
+import Tkinter
 from subprocess import call
 from setuptools import setup
 from pysollib.settings import PACKAGE, VERSION
@@ -26,7 +28,6 @@ call("./scripts/all_games.py > docs/all_games.html", shell=True)
 
 # Use Tile widgets, if they are installed.
 # http://tktable.sourceforge.net/tile/
-import Tkinter
 root = Tkinter.Tk()
 root.withdraw()
 try:

tests/style/py-flake8.t

@@ -26,7 +26,7 @@ my %skip =
 
 # my $cmd = shell_quote( 'flake8', '.' );
 my $cmd = shell_quote( 'flake8',
-    grep { not exists $skip{$_} } glob('pysol.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py') );
+    grep { not exists $skip{$_} } glob('*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py') );
 
 # TEST
 eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );