flake8

pysollib/tk/tabpage.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- mode: python; coding: utf-8; -*-
-# ---------------------------------------------------------------------------##
+# ---------------------------------------------------------------------------
 #
 # Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
 # Copyright (C) 2003 Mt. Hood Playing Card Co.
@@ -19,18 +19,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# ---------------------------------------------------------------------------##
+# ---------------------------------------------------------------------------
 """
 a couple of classes for implementing partial tabbed-page like behaviour
 """
 
-from Tkinter import *
+from Tkinter import EW, FALSE, Frame, Radiobutton, RAISED, RIDGE, StringVar
+from Tkinter import BOTH, Button, Entry, Label, LEFT, NSEW, Tk, TRUE
 
 MYRIDGE, MYRAISED = RAISED, RIDGE
 # MYRIDGE, MYRAISED = RIDGE, RAISED
 
-class InvalidTabPage(Exception): pass
-class AlreadyExists(Exception): pass
+
+class InvalidTabPage(Exception):
+    pass
+
+
+class AlreadyExists(Exception):
+    pass
+
 
 class PageTab(Frame):
     """
@@ -38,11 +45,13 @@ class PageTab(Frame):
     """
     def __init__(self, parent):
         Frame.__init__(self, parent, borderwidth=2, relief=MYRIDGE)
-        self.button=Radiobutton(self, padx=5, pady=5, takefocus=0,
+        self.button = Radiobutton(
+            self, padx=5, pady=5, takefocus=0,
             indicatoron=FALSE, highlightthickness=0,
             borderwidth=0, selectcolor=self.cget('bg'))
         self.button.pack()
 
+
 class TabPageSet(Frame):
     """
     a set of 'pages' with TabButtons for controlling their display
@@ -71,12 +80,12 @@ class TabPageSet(Frame):
             if pageName in self.pages.keys():
                 self.activePage.set(pageName)
             else:
-                raise InvalidTabPage, 'Invalid TabPage Name'
-        ## pop up the active 'tab' only
+                raise InvalidTabPage('Invalid TabPage Name')
+        # pop up the active 'tab' only
         for page in self.pages.keys():
             self.pages[page]['tab'].config(relief=MYRIDGE)
         self.pages[self.GetActivePage()]['tab'].config(relief=MYRAISED)
-        ## switch page
+        # switch page
         self.pages[self.GetActivePage()]['page'].lift()
 
     def GetActivePage(self):
@@ -84,7 +93,7 @@ class TabPageSet(Frame):
 
     def AddPage(self, pageName):
         if pageName in self.pages.keys():
-            raise AlreadyExists, 'TabPage Name Already Exists'
+            raise AlreadyExists('TabPage Name Already Exists')
         self.pages[pageName] = {
             'tab': PageTab(self.tabBar),
             'page': Frame(self, borderwidth=2, relief=RAISED)
@@ -103,8 +112,8 @@ class TabPageSet(Frame):
             self.ChangePage()
 
     def RemovePage(self, pageName):
-        if not pageName in self.pages.keys():
-            raise InvalidTabPage, 'Invalid TabPage Name'
+        if pageName not in self.pages.keys():
+            raise InvalidTabPage('Invalid TabPage Name')
         self.pages[pageName]['tab'].pack_forget()
         self.pages[pageName]['page'].grid_forget()
         self.pages[pageName]['tab'].destroy()
@@ -121,6 +130,7 @@ class TabPageSet(Frame):
             self.activePage.set(self.defaultPage)
         self.ChangePage()
 
+
 if __name__ == '__main__':
     # test dialog
     root = Tk()
@@ -130,9 +140,11 @@ if __name__ == '__main__':
     Label(tabPage.pages['Foobar']['page'], text='Bar', pady=20).pack()
     Label(tabPage.pages['Baz']['page'], text='Baz').pack()
     entryPgName = Entry(root)
-    buttonAdd=Button(root,text='Add Page',
+    buttonAdd = Button(
+        root, text='Add Page',
         command=lambda: tabPage.AddPage(entryPgName.get()))
-    buttonRemove=Button(root,text='Remove Page',
+    buttonRemove = Button(
+        root, text='Remove Page',
         command=lambda: tabPage.RemovePage(entryPgName.get()))
     labelPgName = Label(root, text='name of page to add/remove:')
     buttonAdd.pack(padx=5, pady=5)

tests/style/py-flake8.t

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