From e53632282116c9a5e843893f2b6f1127a40b87e8 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Mon, 17 Apr 2017 12:30:57 +0300 Subject: [PATCH] flake 8 --- pysollib/pysolgtk/findcarddialog.py | 22 ++++++++++++---------- pysollib/pysolgtk/fontsdialog.py | 22 ++++++++-------------- tests/style/py-flake8.t | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/pysollib/pysolgtk/findcarddialog.py b/pysollib/pysolgtk/findcarddialog.py index 4eb4feb0..b1c87809 100644 --- a/pysollib/pysolgtk/findcarddialog.py +++ b/pysollib/pysolgtk/findcarddialog.py @@ -27,16 +27,17 @@ __all__ = ['create_find_card_dialog', ] # imports -## import os -## import Tkinter -## import traceback +# import os +# import Tkinter +# import traceback -## # PySol imports +# # PySol imports -## # Toolkit imports -## from tkutil import after, after_cancel -## from tkutil import bind, unbind_destroy, makeImage -## from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle +# # Toolkit imports +# from tkutil import after, after_cancel +# from tkutil import bind, unbind_destroy, makeImage +# from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, \ +# MfxCanvasRectangle # ************************************************************************ @@ -45,13 +46,14 @@ __all__ = ['create_find_card_dialog', find_card_dialog = None + def create_find_card_dialog(parent, game, dir): pass + def connect_game_find_card_dialog(game): pass + def destroy_find_card_dialog(): pass - - diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index b3e708a4..7195196f 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.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,19 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# ---------------------------------------------------------------------------## +# --------------------------------------------------------------------------- __all__ = ['FontsDialog'] # imports -## import os, sys -## import types -import gtk, gobject, pango +# import os, sys +# import types +import gtk +import pango import gtk.glade # PySol imports -from pysollib.mygettext import _, n_ +from pysollib.mygettext import _ from tkutil import create_pango_font_desc @@ -81,7 +82,6 @@ class FontsDialog: dialog.destroy() - def _setFont(self, name, font): label = self.widgets_tree.get_widget(name+'_label') font_desc = create_pango_font_desc(font) @@ -90,7 +90,6 @@ class FontsDialog: label.set_text(text) label.set_data('user_data', font) - def _changeFont(self, w, name): label = self.widgets_tree.get_widget(name+'_label') font = label.get_data('user_data') @@ -123,7 +122,6 @@ class FontsDialog: dialog.destroy() - def _translateLabels(self): for n in ( 'label54', @@ -140,10 +138,6 @@ class FontsDialog: 'label73', 'label74', 'label75', - ): + ): w = self.widgets_tree.get_widget(n) w.set_text(_(w.get_text())) - - - - diff --git a/tests/style/py-flake8.t b/tests/style/py-flake8.t index 7f155839..4f3a55bb 100644 --- a/tests/style/py-flake8.t +++ b/tests/style/py-flake8.t @@ -10,7 +10,7 @@ use String::ShellQuote qw/ shell_quote /; # my $cmd = shell_quote( 'flake8', '.' ); my $cmd = shell_quote( 'flake8', - grep { not($_ eq './pysollib/pysoltk.py') } glob('./pysollib/*.py ./pysollib/[cm]*/*.py ./pysollib/pysolgtk/[a-e]*.py') ); + grep { not($_ eq './pysollib/pysoltk.py') } glob('./pysollib/*.py ./pysollib/[cm]*/*.py ./pysollib/pysolgtk/[a-f]*.py') ); # TEST eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );