Merge lp:~bellini666/kiwi/test_pyflakes_pep8 into lp:~jdahlin-deactivatedaccount/kiwi/master

[Thiago Bellini]

Testes de pyflakes e pep8.

[lp:~bellini666/kiwi/test_pyflakes_pep8]

1813. By Thiago Bellini on 2012-05-04

Allow running tests from 'make'. Add shorcuts for pyflakes/pep8

=== modified file '.bzrignore'
--- .bzrignore	2011-07-11 02:58:54 +0000
+++ .bzrignore	2012-05-04 16:37:18 +0000
@@ -1,3 +1,4 @@
+_trial_temp
 locale
 build
 locale/es_CL

=== modified file 'Makefile'
--- Makefile	2012-02-10 19:37:37 +0000
+++ Makefile	2012-05-04 16:37:18 +0000
@@ -41,6 +41,15 @@
 	ssh [e-mail] ftpadmin install $(TARBALL)
 	scp dist/kiwi-$(VERSION).win32.exe [e-mail]:/ftp/pub/GNOME/binaries/win32/kiwi/
 
+check:
+	trial tests
+
+pyflakes:
+	trial tests.test_pyflakes
+
+pep8:
+	trial tests.test_pep8
+
 include async.mk
 
 .PHONY: bdist upload-release

=== modified file 'kiwi/accessor.py'
--- kiwi/accessor.py	2006-12-07 14:19:20 +0000
+++ kiwi/accessor.py	2012-05-04 16:37:18 +0000
@@ -40,6 +40,7 @@
 
 log = Logger('kiwi.accessor')
 
+
 def get_default_getter(model, attr_name, cache):
     """Obtains from model a callable through which attr_name can be
     retrieved.  This callable is an accessor named get_foo, where
@@ -55,6 +56,7 @@
     else:
         return (model, attr_name)
 
+
 def get_default_setter(model, attr_name, cache):
     """Obtains from model a callable through which attr_name can be
     set.  This callable is an accessor named set_foo, where
@@ -99,8 +101,10 @@
 _ksetattr_cache = {}
 _ksetattr_wref = {}
 
+
 class CacheControl(object):
     __slots__ = ['key', 'cacheable']
+
     def __init__(self, key):
         self.key = key
         self.cacheable = 1
@@ -110,21 +114,24 @@
 
     def invalidate(self):
         key = self.key
-        if _kgetattr_cache.has_key(key):
+        if key in _kgetattr_cache:
             del _kgetattr_cache[key]
-        if _ksetattr_cache.has_key(key):
+        if key in _ksetattr_cache:
             del _ksetattr_cache[key]
 
+
 class _AttrUnset:
     # indicates an unset value since None needs to be used
     pass
 
+
 class DefaultValue(Exception):
     """
     This can be raised in kgetattr accessors to indicate that the default
     value should be used
     """
 
+
 def kgetattr_guard(wref):
     try:
         key = _kgetattr_wref[id(wref)][0]
@@ -134,6 +141,7 @@
         # This path is used only when the program terminates.
         pass
 
+
 def ksetattr_guard(wref):
     try:
         key = _ksetattr_wref[id(wref)][0]
@@ -143,6 +151,7 @@
         # This path is used only when the program terminates.
         pass
 
+
 # 1. Break up attr_name into parts
 # 2. Loop around main lookup code for each part:
 #     2.1. Try and get accessor tuple out of cache
@@ -152,30 +161,31 @@
 #   Use value as obj in next iteration
 # 3. Return value
 
-def kgetattr(model,
-             attr_name,
-             default=_AttrUnset,
-             flat=0,
-             # bind to local variables for speed:
-             ref=weakref.ref,
-             TupleType=types.TupleType,
-             MethodType=types.MethodType,
-             split=string.split,
-             kgetattr_guard=kgetattr_guard,
-             getattr=getattr,
-             dummycache=CacheControl((None,None)),
-             # constants:
-             # access opcodes:
-             LAMBDA_ACCESS = 0,
-             METHOD_ACCESS = 1,
-             TUPLE_ACCESS = 2,
-             NWR_METHOD_ACCESS = 3,
-             NWR_TUPLE_ACCESS = 4,
-             # FAST tuples do not store the object, as the input object
-             # is also the accesses object.
-             FAST_METHOD_ACCESS = 5,
-             FAST_TUPLE_ACCESS = 6,
-             ):
+def kgetattr(
+    model,
+    attr_name,
+    default=_AttrUnset,
+    flat=0,
+    # bind to local variables for speed:
+    ref=weakref.ref,
+    TupleType=types.TupleType,
+    MethodType=types.MethodType,
+    split=string.split,
+    kgetattr_guard=kgetattr_guard,
+    getattr=getattr,
+    dummycache=CacheControl((None, None)),
+    # constants:
+    # access opcodes:
+    LAMBDA_ACCESS=0,
+    METHOD_ACCESS=1,
+    TUPLE_ACCESS=2,
+    NWR_METHOD_ACCESS=3,
+    NWR_TUPLE_ACCESS=4,
+    # FAST tuples do not store the object, as the input object
+    # is also the accesses object.
+    FAST_METHOD_ACCESS=5,
+    FAST_TUPLE_ACCESS=6,
+    ):
     """Returns the value associated with the attribute in model
     named by attr_name. If default is provided and model does not
     have an attribute called attr_name, the default value is
@@ -284,7 +294,7 @@
                     # store a hard reference.
                     _kgetattr_cache[key] = (obj, icode, data1, data2)
             else:
-                if _kgetattr_cache.has_key(key):
+                if key in _kgetattr_cache:
                     del _kgetattr_cache[key]
 
         # 2.3. Use accessor tuple to grab value
@@ -324,6 +334,7 @@
     # 3. Return value
     return obj
 
+
 # A general algo for ksetattr:
 #
 # 1. Use attr_name to kgetattr the target object, and get the real attribute
@@ -331,28 +342,29 @@
 # 3. If not there, generate accessor tuple and store it
 # 4. Set value to target object's attribute
 
-def ksetattr(model,
-             attr_name,
-             value,
-             flat=0,
-
-             # bind to local variables for speed:
-             ref=weakref.ref,
-             TupleType=types.TupleType,
-             MethodType=types.MethodType,
-             ksetattr_guard=ksetattr_guard,
-             getattr=getattr,
-             dummycache=CacheControl((None,None)),
-
-             # constants:
-             LAMBDA_ACCESS = 0,
-             METHOD_ACCESS = 1,
-             TUPLE_ACCESS = 2,
-             NWR_METHOD_ACCESS = 3,
-             NWR_TUPLE_ACCESS = 4,
-             FAST_METHOD_ACCESS = 5,
-             FAST_TUPLE_ACCESS = 6,
-                 ):
+def ksetattr(
+    model,
+    attr_name,
+    value,
+    flat=0,
+
+    # bind to local variables for speed:
+    ref=weakref.ref,
+    TupleType=types.TupleType,
+    MethodType=types.MethodType,
+    ksetattr_guard=ksetattr_guard,
+    getattr=getattr,
+    dummycache=CacheControl((None, None)),
+
+    # constants:
+    LAMBDA_ACCESS=0,
+    METHOD_ACCESS=1,
+    TUPLE_ACCESS=2,
+    NWR_METHOD_ACCESS=3,
+    NWR_TUPLE_ACCESS=4,
+    FAST_METHOD_ACCESS=5,
+    FAST_TUPLE_ACCESS=6,
+    ):
     """Set the value associated with the attribute in model
     named by attr_name. If flat=1 is specified, no dot path parsing will
     be done."""
@@ -367,7 +379,7 @@
         lastdot = string.rfind(attr_name, ".")
         if lastdot != -1:
             model = kgetattr(model, attr_name[:lastdot])
-            attr_name = attr_name[lastdot+1:]
+            attr_name = attr_name[lastdot + 1:]
 
     # At this point we only have a flat attribute and the right model.
     key = (id(model), attr_name)
@@ -446,7 +458,7 @@
                 # it's not weakref-able, store a hard reference.
                 _ksetattr_cache[key] = (model, icode, data1, data2)
         else:
-            if _ksetattr_cache.has_key(key):
+            if key in _ksetattr_cache:
                 del _ksetattr_cache.has_key[key]
 
     if icode == FAST_TUPLE_ACCESS:
@@ -466,6 +478,7 @@
     else:
         raise AssertionError("Unknown tuple type in _ksetattr_cache")
 
+
 def enable_attr_cache():
     """Enables the use of the kgetattr cache when using Python
     versions that do not support weakrefs (1.5.x and earlier). Be
@@ -477,6 +490,7 @@
     _kgetattr_wref = {}
     _ksetattr_wref = {}
 
+
 def clear_attr_cache():
     """Clears the kgetattr cache. It must be called repeatedly to
     avoid memory leaks in Python 2.0 and earlier."""

=== modified file 'kiwi/argcheck.py'
--- kiwi/argcheck.py	2012-04-10 18:14:36 +0000
+++ kiwi/argcheck.py	2012-05-04 16:37:18 +0000
@@ -30,17 +30,22 @@
 
 from kiwi.datatypes import number as number_type
 
+_NoValue = object()
+
+
 class CustomType(type):
     @classmethod
     def value_check(mcs, name, value):
         pass
 
+
 class number(CustomType):
     """
     Custom type that verifies that the type is a number (eg float or int)
     """
     type = number_type
 
+
 class percent(CustomType):
     """
     Custom type that verifies that the value is a percentage
@@ -52,7 +57,6 @@
         if (value < 0) or (value > 100):
             raise ValueError("%s must be between 0 and 100" % name)
 
-_NoValue = object()
 
 class argcheck(object):
     """

=== modified file 'kiwi/component.py'
--- kiwi/component.py	2012-04-10 18:14:36 +0000
+++ kiwi/component.py	2012-05-04 16:37:18 +0000
@@ -40,11 +40,10 @@
                         return True
             return False
 
-
     class Attribute(object):
         def __init__(self, __name__, __doc__=''):
-            self.__name__=__name__
-            self.__doc__=__doc__
+            self.__name__ = __name__
+            self.__doc__ = __doc__
 
     def implements(iface):
         frame = sys._getframe(1)
@@ -53,9 +52,11 @@
         finally:
             del frame
 
+
 class AlreadyImplementedError(Exception):
     """Called when a utility already exists."""
 
+
 class _UtilityHandler(object):
     def __init__(self):
         self._utilities = {}
@@ -97,6 +98,7 @@
     def clean(self):
         self._utilities = {}
 
+
 def provide_utility(iface, utility, replace=False):
     """
     Set the utility for the named interface. If the utility is already
@@ -107,6 +109,7 @@
     """
     utilities.provide(iface, utility, replace)
 
+
 def get_utility(iface, default=ValueUnset):
     """
     Get the utility for the named interface. If the utility is not
@@ -120,6 +123,7 @@
 
     return utilities.get(iface, default)
 
+
 def remove_utility(iface):
     """
     Remove the utility provided for an interface
@@ -132,6 +136,5 @@
 
     return utilities.remove(iface)
 
+
 utilities = _UtilityHandler()
-
-

=== modified file 'kiwi/controllers.py'
--- kiwi/controllers.py	2007-03-22 13:20:25 +0000
+++ kiwi/controllers.py	2012-05-04 16:37:18 +0000
@@ -26,6 +26,7 @@
 
 """Holds the base controller class for the Kiwi Framework"""
 
+
 class BaseController:
     """
     A generic controller that can be attached to any View
@@ -36,6 +37,7 @@
           holds the UI implementation itself (widgets, layout, etc.)
     """
     view = None
+
     def __init__(self, view=None, keyactions=None):
         """
         Creates a new controller, and attaches itself to a view. The
@@ -53,7 +55,7 @@
 
         if not view and not self.view:
             raise AssertionError(
-                "Need a view to create controller, found None" )
+                "Need a view to create controller, found None")
         else:
             self.set_view(view)
 
@@ -92,7 +94,6 @@
         if func:
             return func()
 
-
     #
     # Accessors
     #

=== modified file 'kiwi/currency.py'
--- kiwi/currency.py	2012-03-12 20:54:34 +0000
+++ kiwi/currency.py	2012-05-04 16:37:18 +0000
@@ -32,6 +32,7 @@
 
 _ = lambda m: gettext.dgettext('kiwi', m)
 
+
 class currency(Decimal):
     """
     A datatype representing currency, used together with the list and
@@ -128,8 +129,8 @@
                 if frac_digits == 127:
                     frac_digits = 2
 
-            format = '%%.%sf' % (frac_digits+1)
-            dec_part = (format % value)[-(frac_digits+1):-1]
+            format = '%%.%sf' % (frac_digits + 1)
+            dec_part = (format % value)[-(frac_digits + 1):-1]
 
             mon_decimal_point = conv.get('mon_decimal_point', '.')
             currency += mon_decimal_point + dec_part
@@ -160,6 +161,7 @@
 
 _DecimalConverter = type(converter.get_converter(Decimal))
 
+
 class _CurrencyConverter(_DecimalConverter):
     type = currency
     name = _('Currency')

=== modified file 'kiwi/datatypes.py'
--- kiwi/datatypes.py	2012-03-12 20:54:34 +0000
+++ kiwi/datatypes.py	2012-05-04 16:37:18 +0000
@@ -54,21 +54,25 @@
     Decimal, InvalidOperation # pyflakes
 except:
     HAVE_DECIMAL = False
+
     class Decimal(float):
         pass
+
     InvalidOperation = ValueError
 
 if sys.platform == 'win32':
     try:
         import ctypes
+
         def GetLocaleInfo(value):
             s = ctypes.create_string_buffer("\000" * 255)
             ctypes.windll.kernel32.GetLocaleInfoA(0, value, s, 255)
             return str(s.value)
     except ImportError:
-        def GetLocaleInfo(value):
+        def _GetLocaleInfo(value):
             raise Exception(
                 "ctypes is required for datetime types on win32")
+        GetLocaleInfo = _GetLocaleInfo
 
 __all__ = ['ValidationError', 'lformat', 'converter', 'format_price']
 
@@ -76,9 +80,11 @@
 
 number = (int, float, long, Decimal)
 
+
 class ValidationError(Exception):
     pass
 
+
 class ConverterRegistry:
     def __init__(self):
         self._converters = {}
@@ -99,7 +105,7 @@
         self._converters[str(c.type)] = c
         self._converters[c.type.__name__] = c
         return c
-    
+
     def remove(self, converter_type):
         """
         Removes converter_type from the registry
@@ -195,6 +201,7 @@
 # Global converter, can be accessed from outside
 converter = ConverterRegistry()
 
+
 class BaseConverter(object):
     """
     Abstract converter used by all datatypes
@@ -237,6 +244,7 @@
         """
         return None
 
+
 class _StringConverter(BaseConverter):
     type = str
     name = _('String')
@@ -251,6 +259,7 @@
 
 converter.add(_StringConverter)
 
+
 class _UnicodeConverter(BaseConverter):
     type = unicode
     name = _('Unicode')
@@ -265,6 +274,7 @@
 
 converter.add(_UnicodeConverter)
 
+
 class _IntConverter(BaseConverter):
     type = int
     name = _('Integer')
@@ -294,11 +304,14 @@
 
 converter.add(_IntConverter)
 
+
 class _LongConverter(_IntConverter):
     type = long
     name = _('Long')
+
 converter.add(_LongConverter)
 
+
 class _BoolConverter(BaseConverter):
     type = bool
     name = _('Boolean')
@@ -321,6 +334,7 @@
 
 converter.add(_BoolConverter)
 
+
 class _FloatConverter(BaseConverter):
     type = float
     name = _('Float')
@@ -373,10 +387,12 @@
 
 converter.add(_FloatConverter)
 
+
 class _DecimalConverter(_FloatConverter):
     type = Decimal
     name = _('Decimal')
     align = Alignment.RIGHT
+
     def from_string(self, value, filter=True):
         if value == '':
             return ValueUnset
@@ -414,7 +430,7 @@
 # a tuple, which holds in the first position the
 # mask characters and in the second position
 # a "human-readable" format, used for outputting user
-# messages (see method _BaseDateTimeConverter.convert_format) 
+# messages (see method _BaseDateTimeConverter.convert_format)
 DATE_MASK_TABLE = {
     '%m': ('00', _('mm')),
     '%y': ('00', _('yy')),
@@ -428,6 +444,7 @@
     '%r': ('00:00:00 LL', _('hh:mm:ss LL')),
     }
 
+
 class _BaseDateTimeConverter(BaseConverter):
     """
     Abstract class for converting datatime objects to and from strings
@@ -563,6 +580,7 @@
     type = datetime.time
     name = _('Time')
     date_format = '%X'
+
     def get_lang_constant_win32(self):
         return [LOCALE_STIMEFORMAT]
 
@@ -572,12 +590,15 @@
     def from_dateinfo(self, dateinfo):
         # hour, minute, second
         return datetime.time(*dateinfo[3:6])
+
 converter.add(_TimeConverter)
 
+
 class _DateTimeConverter(_BaseDateTimeConverter):
     type = datetime.datetime
     name = _('Date and Time')
     date_format = '%c'
+
     def get_lang_constant_win32(self):
         return [LOCALE_SSHORTDATE, LOCALE_STIMEFORMAT]
 
@@ -587,12 +608,15 @@
     def from_dateinfo(self, dateinfo):
         # year, month, day, hour, minute, second
         return datetime.datetime(*dateinfo[:6])
+
 converter.add(_DateTimeConverter)
 
+
 class _DateConverter(_BaseDateTimeConverter):
     type = datetime.date
     name = _('Date')
     date_format = '%x'
+
     def get_lang_constant_win32(self):
         return [LOCALE_SSHORTDATE]
 
@@ -602,16 +626,20 @@
     def from_dateinfo(self, dateinfo):
         # year, month, day
         return datetime.date(*dateinfo[:3])
+
 converter.add(_DateConverter)
 
+
 class _ObjectConverter(BaseConverter):
     type = object
     name = _('Object')
 
     as_string = None
     from_string = None
+
 converter.add(_ObjectConverter)
 
+
 class _EnumConverter(BaseConverter):
     type = enum
     name = _('Enum')
@@ -632,10 +660,12 @@
 
 converter.add(_EnumConverter)
 
+
 def lformat(format, value):
     """Like locale.format but with grouping enabled"""
     return locale.format(format, value, 1)
 
+
 def get_localeconv():
     conv = locale.localeconv()
 
@@ -661,6 +691,7 @@
 
     return conv
 
+
 def filter_locale(value, monetary=False):
     """
     Removes the locale specific data from the value string.
@@ -682,7 +713,7 @@
         th_sep_count = value.count(thousands_sep)
         if th_sep_count and decimal_points:
             decimal_point_pos = value.index(decimal_point)
-            if thousands_sep in value[decimal_point_pos+1:]:
+            if thousands_sep in value[decimal_point_pos + 1:]:
                 raise ValidationError(_("You have a thousand separator to the "
                                         "right of the decimal point"))
             check_value = value[:decimal_point_pos]

=== modified file 'kiwi/db/query.py'
--- kiwi/db/query.py	2012-02-10 19:37:37 +0000
+++ kiwi/db/query.py	2012-05-04 16:37:18 +0000
@@ -27,6 +27,7 @@
 # Query building
 #
 
+
 class QueryState(object):
     def __init__(self, search_filter):
         """

=== modified file 'kiwi/db/sqlobj.py'
--- kiwi/db/sqlobj.py	2012-02-10 19:37:37 +0000
+++ kiwi/db/sqlobj.py	2012-05-04 16:37:18 +0000
@@ -33,12 +33,15 @@
      NumberIntervalQueryState
 from kiwi.interfaces import ISearchFilter
 
+
 class _FTI(SQLExpression):
     def __init__(self, q):
         self.q = q
+
     def __sqlrepr__(self, db):
         return self.q
 
+
 class SQLObjectQueryExecuter(QueryExecuter):
     def __init__(self, conn=None):
         QueryExecuter.__init__(self)

=== modified file 'kiwi/db/stormintegration.py'
--- kiwi/db/stormintegration.py	2012-02-10 19:37:37 +0000
+++ kiwi/db/stormintegration.py	2012-05-04 16:37:18 +0000
@@ -34,7 +34,9 @@
      NumberIntervalQueryState
 from kiwi.interfaces import ISearchFilter
 
-# FIXME: make this usable outside of stoqlib 
+# FIXME: make this usable outside of stoqlib
+
+
 class StormQueryExecuter(QueryExecuter):
     """Execute queries from a storm database"""
 
@@ -202,4 +204,3 @@
             queries.append(table_field <= state.end)
         if queries:
             return And(*queries)
-

=== modified file 'kiwi/decorators.py'
--- kiwi/decorators.py	2012-02-10 19:37:37 +0000
+++ kiwi/decorators.py	2012-05-04 16:37:18 +0000
@@ -25,6 +25,7 @@
 
 from kiwi.log import kiwi_log
 
+
 class deprecated(object):
     """
     I am a decorator which prints a deprecation warning each
@@ -57,6 +58,7 @@
                 raise
         return wrapper
 
+
 class signal_block(object):
     """
     A decorator to be used on :class:`kiwi.ui.views.SlaveView` methods.

=== modified file 'kiwi/desktopparser.py'
--- kiwi/desktopparser.py	2012-02-10 19:37:37 +0000
+++ kiwi/desktopparser.py	2012-05-04 16:37:18 +0000
@@ -30,21 +30,25 @@
 
 # Private
 
+
 def _localize(option, locale):
     if locale:
         option = option + '[%s]' % locale
     return option
 
+
 def _tobool(s):
     if s == 'true':
         return True
     return False
 
+
 def _frombool(s):
     if s:
         return 'true'
     return 'false'
 
+
 class DesktopParser(ConfigParser):
     """
     A DesktopParser for GNOME/KDE .desktop files.

=== modified file 'kiwi/dist.py'
--- kiwi/dist.py	2012-02-21 14:02:07 +0000
+++ kiwi/dist.py	2012-05-04 16:37:18 +0000
@@ -38,6 +38,7 @@
 
 from setuptools import setup as DS_setup
 
+
 class _VariableExtender:
     def __init__(self, distribution):
         install = distribution.get_command_obj('install')
@@ -85,6 +86,7 @@
             string = string.replace('$' + name, var)
         return string
 
+
 class KiwiInstallLib(install_lib):
     # Overridable by subclass
     resources = {}
@@ -175,6 +177,7 @@
 # Backwards compat
 TemplateInstallLib = KiwiInstallLib
 
+
 class KiwiInstallData(install_data):
     def run(self):
         self.varext = _VariableExtender(self.distribution)
@@ -225,6 +228,7 @@
         site = 'dist-packages'
     return os.path.join(libdir, site, *dirs)
 
+
 def listfiles(*dirs):
     """
     Lists all files in directories and optionally uses basic shell
@@ -245,6 +249,7 @@
             for filename in os.listdir(abspath)
                 if filename[0] != '.' and fnmatch(filename, pattern)]
 
+
 def compile_po_files(domain, dirname='locale'):
     """
     Compiles po files to mo files.
@@ -277,6 +282,7 @@
 
     return data_files
 
+
 def listpackages(root, exclude=None):
     """Recursivly list all packages in directory root
     Optionally exclude can be specified which is a string
@@ -308,6 +314,7 @@
 
     return packages
 
+
 def setup(**kwargs):
     """
     A drop in replacement for distutils.core.setup which
@@ -329,7 +336,7 @@
     def run_install(self):
         name = kwargs.get('name')
         if name:
-           self.data_files.extend(compile_po_files(name))
+            self.data_files.extend(compile_po_files(name))
         KiwiInstallData.run(self)
 
         varext = _VariableExtender(self.distribution)
@@ -356,7 +363,6 @@
                 info('installing template %s' % target_file)
                 open(target_file, 'w').write(data)
 
-
     # distutils uses old style classes
     InstallData = new.classobj('InstallData', (KiwiInstallData,),
                                dict(run=run_install))

=== modified file 'kiwi/enums.py'
--- kiwi/enums.py	2008-05-08 16:47:26 +0000
+++ kiwi/enums.py	2012-05-04 16:37:18 +0000
@@ -23,22 +23,27 @@
 
 from kiwi.python import enum
 
+
 class ComboColumn(enum):
     (LABEL,
      DATA) = range(2)
 
+
 class ComboMode(enum):
     (UNKNOWN,
      STRING,
      DATA) = range(3)
 
+
 class Alignment(enum):
     (LEFT,
      RIGHT) = range(2)
 
+
 class Direction(enum):
     (LEFT, RIGHT) = (1, -1)
 
+
 class ListType(enum):
     """
     - NORMAL: Add, Remove, Edit
@@ -55,6 +60,7 @@
      UNADDABLE,
      UNEDITABLE) = range(6)
 
+
 class SearchFilterPosition(enum):
     """
     An enum used to indicate where a search filter should be added to
@@ -65,4 +71,3 @@
     """
     (TOP,
      BOTTOM) = range(2)
-

=== modified file 'kiwi/environ.py'
--- kiwi/environ.py	2012-03-01 18:40:15 +0000
+++ kiwi/environ.py	2012-05-04 16:37:18 +0000
@@ -42,6 +42,7 @@
 
 EnvironmentError = EnvironmentError
 
+
 # From http://tinyurl.com/77ukj
 def _is_frozen():
     "Helper function to check if we're frozen in a py2exe'd file"
@@ -49,6 +50,7 @@
             hasattr(sys, "importers") # old py2exe
             or imp.is_frozen("__main__")) # tools/freeze
 
+
 class Environment:
     """Environment control
 
@@ -171,6 +173,7 @@
 
     epydoc = property(_get_epydoc)
 
+
 class Library(Environment):
     """A Library is a local environment object, it's a subclass of the
     Environment class.
@@ -379,12 +382,13 @@
                 fp = open(revision)
             except IOError, e:
                 if e.errno != errno.ENOENT:
-                     raise
+                    raise
             else:
                 return fp.read().split()[0]
         else:
             return str(self.module.revision)
 
+
 class Application(Library):
     """Application extends a :class:`Library`. It's meant to be used
     by applications
@@ -438,7 +442,7 @@
         """
         Library.enable_translation(self, domain, localedir)
         old_domain = gettext.textdomain()
-        if old_domain  != 'messages':
+        if old_domain != 'messages':
             log.warn('overriding default domain, was %s' % old_domain)
 
         self.set_application_domain(domain)

=== modified file 'kiwi/i18n/i18n.py'
--- kiwi/i18n/i18n.py	2011-07-05 22:05:42 +0000
+++ kiwi/i18n/i18n.py	2012-05-04 16:37:18 +0000
@@ -35,6 +35,7 @@
 # will be generate from it, see update_po()
 POTFILES = 'POTFILES.list'
 
+
 def check_directory(root):
     po_dir = os.path.join(root, 'po')
     if not os.path.exists(po_dir):
@@ -47,12 +48,14 @@
         if not os.path.isdir(po_dir):
             raise SystemExit("locale must be a directory")
 
+
 def check_pot_file(root, package):
     pot_file = os.path.join(root, 'po', '%s.pot' % package)
     if not os.path.exists(pot_file):
         raise SystemExit("Need a pot file, run --update first")
     return pot_file
 
+
 def get_translatable_files(root):
     pofiles = os.path.join(root, 'po', POTFILES)
     if not os.path.exists(pofiles):
@@ -66,9 +69,11 @@
         filelist.process_template_line(line)
     return sorted(filelist.files)
 
+
 def list_languages(root):
     return [os.path.basename(po_file[:-3])
-                for po_file in listfiles(root, 'po', '*.po')]
+            for po_file in listfiles(root, 'po', '*.po')]
+
 
 def update_po(root, package):
     update_pot(root, package)
@@ -88,6 +93,7 @@
 
     os.chdir(old)
 
+
 def update_pot(root, package):
     files = get_translatable_files(root)
     potfiles_in = os.path.join(root, 'po', 'POTFILES.in')
@@ -105,7 +111,6 @@
         fd.write(filename + '\n')
     fd.close()
 
-
     old = os.getcwd()
     os.chdir(os.path.join(root, 'po'))
 
@@ -124,6 +129,7 @@
 
     os.unlink(potfiles_in)
 
+
 def _clean_rml(data):
     fixed = ''
     while data:
@@ -137,9 +143,10 @@
         if end_pos == -1:
             end_pos = data.find('/>')
             assert end_pos != -1
-        data = data[end_pos+2:]
+        data = data[end_pos + 2:]
     return fixed
 
+
 def _extract_rml_files(root):
     files = []
     for rml_file in sorted(findall(root)):
@@ -153,7 +160,7 @@
         if os.path.exists(extracted):
             os.unlink(extracted)
         open(extracted, 'w').write(data)
-        extracted = extracted[len(root)+1:]
+        extracted = extracted[len(root) + 1:]
         cmd = 'intltool-extract -q --type=gettext/xml %s' % extracted
         res = os.system(cmd)
         if res != 0:
@@ -162,6 +169,7 @@
         files.append(extracted + '.h')
     return files
 
+
 def compile_po_files(root, package):
     if os.system('msgfmt 2> /dev/null') != 256:
         print 'msgfmt could not be found, disabling translations'
@@ -178,6 +186,7 @@
                 os.makedirs(directory)
             os.system('msgfmt %s -o %s' % (po_file, mo))
 
+
 def main(args):
     parser = OptionParser()
     parser.add_option('-a', '--add',

=== modified file 'kiwi/i18n/msgfmt.py'
--- kiwi/i18n/msgfmt.py	2005-11-21 16:39:32 +0000
+++ kiwi/i18n/msgfmt.py	2012-05-04 16:37:18 +0000
@@ -36,7 +36,6 @@
 MESSAGES = {}
 
 
-

 def usage(code, msg=''):
     print >> sys.stderr, doc
     if msg:
@@ -44,7 +43,6 @@
     sys.exit(code)
 
 
-

 def add(id, str, fuzzy):
     "Add a non-fuzzy translation to the dictionary."
     global MESSAGES
@@ -52,7 +50,6 @@
         MESSAGES[id] = str
 
 
-

 def generate():
     "Return the generated output."
     global MESSAGES
@@ -71,7 +68,7 @@
     # The header is 7 32-bit unsigned integers.  We don't use hash tables, so
     # the keys start right after the index tables.
     # translated string.
-    keystart = 7*4+16*len(keys)
+    keystart = (7 * 4) + (16 * len(keys))
     # and the values start after the keys
     valuestart = keystart + len(ids)
     koffsets = []
@@ -79,23 +76,22 @@
     # The string table first has the list of keys, then the list of values.
     # Each entry has first the size of the string, then the file offset.
     for o1, l1, o2, l2 in offsets:
-        koffsets += [l1, o1+keystart]
-        voffsets += [l2, o2+valuestart]
+        koffsets += [l1, o1 + keystart]
+        voffsets += [l2, o2 + valuestart]
     offsets = koffsets + voffsets
     output = struct.pack("Iiiiiii",
-                         0x950412deL,       # Magic
-                         0,                 # Version
-                         len(keys),         # # of entries
-                         7*4,               # start of key index
-                         7*4+len(keys)*8,   # start of value index
-                         0, 0)              # size and offset of hash table
+                         0x950412deL,           # Magic
+                         0,                     # Version
+                         len(keys),             # # of entries
+                         7 * 4,                 # start of key index
+                         7 * 4 + len(keys) * 8, # start of value index
+                         0, 0)                  # size and offset of hash table
     output += array.array("i", offsets).tostring()
     output += ids
     output += strs
     return output
 
 
-

 def make(filename, outfile):
     ID = 1
     STR = 2
@@ -167,12 +163,11 @@
     output = generate()
 
     try:
-        open(outfile,"wb").write(output)
-    except IOError,msg:
+        open(outfile, "wb").write(output)
+    except IOError, msg:
         print >> sys.stderr, msg
 
 
-

 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'hVo:',

=== modified file 'kiwi/interfaces.py'
--- kiwi/interfaces.py	2012-02-10 19:37:37 +0000
+++ kiwi/interfaces.py	2012-05-04 16:37:18 +0000
@@ -26,6 +26,7 @@
 
 from kiwi.component import Interface
 
+
 class IProxyWidget(Interface):
     """
     IProxyWidget is a widget that can be attached to a proxy.
@@ -52,6 +53,7 @@
         """
         pass
 
+
 class IValidatableProxyWidget(IProxyWidget):
     """
     IValidatableProxyWidget extends IProxyWidget with validation support
@@ -72,6 +74,7 @@
     def validate(force=False):
         pass
 
+
 class IEasyCombo(Interface):
 
     def prefill(itemdata, sort=False):
@@ -152,6 +155,7 @@
     def get_model_items():
         pass
 
+
 class AbstractGladeAdaptor(Interface):
     """Abstract class that define the functionality an class that handle
     glade files should provide."""
@@ -174,6 +178,7 @@
         values of dic
         """
 
+
 class ISearchFilter(Interface):
 
     def get_state():

=== modified file 'kiwi/log.py'
--- kiwi/log.py	2012-02-10 19:37:37 +0000
+++ kiwi/log.py	2012-05-04 16:37:18 +0000
@@ -70,21 +70,25 @@
 _console = None
 _filter = None
 
+
 class LogError(Exception):
     pass
 
+
 class Logger(object):
     # Backwards compatibility, we should probably replace the callsites
     # with import logging; logging.getLogger(name)
     def __new__(self, name):
         return logging.getLogger(name)
 
+
 class _Logger(logging.Logger):
     def __call__(self, message, *args, **kwargs):
         self.info(message, *args, **kwargs)
 
 logging.setLoggerClass(_Logger)
 
+
 class ReversedGlobalFilter(logging.Filter):
     """
     It's like a reversed filter, the default behavior
@@ -106,6 +110,7 @@
 
         return False
 
+
 def set_log_file(filename, mask=None):
     """
     Set the filename used for logging.
@@ -127,6 +132,7 @@
 
     return file_handler.stream
 
+
 def set_log_level(name, level):
     """
     Set the log level.
@@ -137,6 +143,7 @@
     global _filter
     _filter.add_filter(name, level)
 
+
 def _read_log_levels(console_filter):
     log_levels = {}
     # bootstrap issue, cannot depend on kiwi.environ
@@ -163,6 +170,7 @@
 
         console_filter.add_filter(name, level)
 
+
 def _create_console():
     global _filter, _console
 
@@ -184,6 +192,7 @@
     _filter = console_filter
     _console = console
 
+
 def update_logger():
     _create_console()
 

=== modified file 'kiwi/model.py'
--- kiwi/model.py	2012-04-10 18:14:36 +0000
+++ kiwi/model.py	2012-05-04 16:37:18 +0000
@@ -37,6 +37,7 @@
 # attributes are changed, it notifies any proxies of the change.
 #
 
+
 class Model:
     """
     The Model is a mixin to be used by domain classes when attached to
@@ -86,13 +87,13 @@
 
         # XXX: should use weakref if possible, and if not, warn of leaks
         proxies = self._v_proxies
-        if not proxies.has_key(attr):
+        if not attr in proxies:
             proxies[attr] = [proxy]
         else:
             if proxy in proxies[attr]:
-                raise AssertionError, ("Tried to attach proxy %s "
-                                       "twice to attribute `%s'."
-                                       % ( proxy, attr ))
+                raise AssertionError("Tried to attach proxy %s "
+                                     "twice to attribute `%s'." %
+                                     (proxy, attr))
             proxies[attr].append(proxy)
 
     def unregister_proxy_for_attribute(self, attr, proxy):
@@ -100,7 +101,7 @@
         if not hasattr(self, "_v_proxies"):
             self.ensure_init()
         proxies = self._v_proxies
-        if proxies.has_key(attr) and proxy in proxies[attr]:
+        if attr in proxies and proxy in proxies[attr]:
             # Only one listener per attribute per proxy, so remove()
             # works
             proxies[attr].remove(proxy)
@@ -157,12 +158,9 @@
         if not hasattr(self, "_v_proxies"):
             self.ensure_init()
 
-        if self._v_autonotify and self._v_proxies.has_key(attr):
+        if self._v_autonotify and attr in self._v_proxies:
             self.notify_proxies(attr)
 
-#
-# A sample model that pickles itself into a file
-#
 
 class PickledModel(Model):
     """

=== modified file 'kiwi/python.py'
--- kiwi/python.py	2012-04-10 18:14:36 +0000
+++ kiwi/python.py	2012-05-04 16:37:18 +0000
@@ -28,12 +28,14 @@
 
 __all__ = ['ClassInittableMetaType', 'ClassInittableObject']
 
+
 class ClassInittableMetaType(type):
     # pylint fails to understand this is a metaclass
     def __init__(self, name, bases, namespace):
         type.__init__(self, name, bases, namespace)
         self.__class_init__(namespace)
 
+
 class ClassInittableObject(object):
     """
     I am an object which will call a classmethod called
@@ -98,7 +100,7 @@
             raise TypeError("'target' is a reserved attribute")
 
         for attribute in ns['attributes']:
-            setattr(cls, attribute,  _ForwardedProperty(attribute))
+            setattr(cls, attribute, _ForwardedProperty(attribute))
 
     def __init__(self, target):
         """
@@ -146,6 +148,7 @@
 
     return obj
 
+
 class Settable:
     """
     A mixin class for syntactic sugar.  Lets you assign attributes by
@@ -172,6 +175,7 @@
                             ', '.join(
             ['%s=%r' % (attr, getattr(self, attr)) for attr in self._attrs]))
 
+
 def qual(klass):
     """
     Convert a class to a string representation, which is the name of the module
@@ -181,6 +185,7 @@
     """
     return klass.__module__ + '.' + klass.__name__
 
+
 def clamp(x, low, high):
     """
     Ensures that x is between the limits set by low and high.
@@ -197,6 +202,7 @@
 
     return min(max(x, low), high)
 
+
 def slicerange(slice, limit):
     """Takes a slice object and returns a range iterator
 
@@ -209,6 +215,7 @@
 
 _no_deprecation = False
 
+
 def deprecationwarn(msg, stacklevel=2):
     """
     Prints a deprecation warning
@@ -219,6 +226,7 @@
 
     warnings.warn(msg, DeprecationWarning, stacklevel=stacklevel)
 
+
 def disabledeprecationcall(func, *args, **kwargs):
     """
     Disables all deprecation warnings during the function call to func
@@ -230,6 +238,7 @@
     _no_deprecation = old
     return retval
 
+
 class enum(int):
     """
     enum is an enumered type implementation in python.
@@ -298,6 +307,7 @@
             self.__class__.__name__, self.name)
     __repr__ = __str__
 
+
 def all(seq):
     """
     Predict used to check if all items in a seq are True.
@@ -308,6 +318,7 @@
             return False
     return True
 
+
 def any(seq):
     """
     Predict used to check if any item in a seq are True.

=== modified file 'kiwi/tasklet.py'
--- kiwi/tasklet.py	2012-02-10 19:37:37 +0000
+++ kiwi/tasklet.py	2012-05-04 16:37:18 +0000
@@ -188,6 +188,7 @@
 
 _event = None
 
+
 class task(object):
     """A decorator that modifies a tasklet function to avoid the need
     to call C{tasklet.run(func())} or C{tasklet.Tasklet(func())}.
@@ -200,6 +201,7 @@
     def __call__(self, *args, **kwargs):
         return Tasklet(self._func(*args, **kwargs))
 
+
 def get_event():
     """
     Return the last event that caused the current tasklet to regain control.
@@ -214,6 +216,7 @@
     _event = None
     return event
 
+
 def run(gen):
     """Start running a generator as a :class:`Tasklet`.
 
@@ -426,6 +429,7 @@
             self._id = None
         return retval
 
+
 class WaitForIdle(WaitCondition):
     '''An object that waits for the main loop to become idle'''
 
@@ -507,6 +511,7 @@
         self._idle_id = None
         return False
 
+
 class WaitForSignal(WaitCondition):
     '''An object that waits for a signal emission'''
 
@@ -811,7 +816,7 @@
             return None
         else:
             self.state = Tasklet.STATE_SUSPENDED
-            assert gen_value is not None            
+            assert gen_value is not None
         if __debug__:
             if had_event and _event is not None:
                 warnings.warn("Tasklet %s forgot to read an event!" % self)
@@ -892,7 +897,6 @@
                 return self._message_queue.pop(idx)
         return None
 
-
     def _update_wait_conditions(self, old_wait_list):
         '''disarm wait conditions removed and arm new wait conditions'''
 

=== modified file 'kiwi/ui/builderloader.py'
--- kiwi/ui/builderloader.py	2012-02-21 20:25:01 +0000
+++ kiwi/ui/builderloader.py	2012-05-04 16:37:18 +0000
@@ -56,6 +56,7 @@
 
 log = Logger('builderloader')
 
+
 class BuilderWidgetTree:
     def __init__(self, view, gladefile=None, domain=None, data=None):
         self._view = view

=== modified file 'kiwi/ui/comboboxentry.py'
--- kiwi/ui/comboboxentry.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/comboboxentry.py	2012-05-04 16:37:18 +0000
@@ -31,6 +31,7 @@
 from kiwi.python import deprecationwarn
 from kiwi.ui.entry import KiwiEntry
 
+
 class BaseComboBoxEntry(gtk.ComboBox):
     def __init__(self, model=None, text_column=-1):
         deprecationwarn(
@@ -110,6 +111,7 @@
 
 gobject.type_register(BaseComboBoxEntry)
 
+
 def test():
     win = gtk.Window()
     win.connect('delete-event', gtk.main_quit)

=== modified file 'kiwi/ui/comboentry.py'
--- kiwi/ui/comboentry.py	2012-03-15 17:58:30 +0000
+++ kiwi/ui/comboentry.py	2012-05-04 16:37:18 +0000
@@ -41,6 +41,7 @@
 
 class _ComboEntryPopup(gtk.Window):
     gsignal('text-selected', str)
+
     def __init__(self, comboentry):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
         self.add_events(gdk.BUTTON_PRESS_MASK)
@@ -255,7 +256,7 @@
             if gdk.keyboard_grab(window, True, activate_time) == 0:
                 return True
             else:
-                window.pointer_ungrab(activate_time);
+                window.pointer_ungrab(activate_time)
                 return False
         return False
 
@@ -268,7 +269,7 @@
 
         allocation = widget.get_allocation()
 
-        window  = widget.get_window()
+        window = widget.get_window()
         # Gtk+ 3.x
         if hasattr(window, 'get_root_coords'):
             x = 0
@@ -321,7 +322,7 @@
               y - monitor.y):
             y += allocation.height
             height = monitor.y + monitor.height - y
-        else :
+        else:
             height = y - monitor.y
             y = monitor.y
 
@@ -358,10 +359,10 @@
             # testcase
             tmodel = model.get_model()
             if tmodel.iter_is_valid(treeiter):
-               # revert back to the unfiltered model so we can select
-               # the right object
-               self._treeview.set_model(tmodel)
-               self._selection = self._treeview.get_selection()
+                # revert back to the unfiltered model so we can select
+                # the right object
+                self._treeview.set_model(tmodel)
+                self._selection = self._treeview.get_selection()
             else:
                 treeiter = model.convert_child_iter_to_iter(treeiter)
         self._selection.select_iter(treeiter)
@@ -371,6 +372,7 @@
 
 type_register(_ComboEntryPopup)
 
+
 class ComboEntry(gtk.VBox):
 
     implements(IEasyCombo)
@@ -596,7 +598,6 @@
         """
         return self._popup.get_selected_iter()
 
-
     def get_mode(self):
         return self.mode
 

=== modified file 'kiwi/ui/dateentry.py'
--- kiwi/ui/dateentry.py	2012-04-03 16:29:49 +0000
+++ kiwi/ui/dateentry.py	2012-05-04 16:37:18 +0000
@@ -39,8 +39,10 @@
 
 date_converter = converter.get_converter(datetime.date)
 
+
 class _DateEntryPopup(gtk.Window):
     gsignal('date-selected', object)
+
     def __init__(self, dateentry):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
         self.add_events(gdk.BUTTON_PRESS_MASK)
@@ -179,7 +181,7 @@
             if gdk.keyboard_grab(window, True, activate_time) == 0:
                 return True
             else:
-                window.get_display().pointer_ungrab(activate_time);
+                window.get_display().pointer_ungrab(activate_time)
                 return False
         return False
 
@@ -192,7 +194,7 @@
         # We need to fetch the coordinates of the entry window
         # since comboentry itself does not have a window
         allocation = widget.get_allocation()
-        window  = widget.get_window()
+        window = widget.get_window()
         # Gtk+ 3.x
         if hasattr(window, 'get_root_coords'):
             x = 0
@@ -231,7 +233,7 @@
               y - monitor.y):
             y += allocation.height
             height = monitor.y + monitor.height - y
-        else :
+        else:
             height = y - monitor.y
             y = monitor.y
 
@@ -306,6 +308,7 @@
         self.calendar.clear_marks()
         self.calendar.mark_day(date.day)
 
+
 class DateEntry(gtk.HBox):
     """I am an entry which you can input a date on.
     In addition to an gtk.Entry I also contain a button
@@ -314,6 +317,7 @@
     """
     gsignal('changed')
     gsignal('activate')
+
     def __init__(self):
         gtk.HBox.__init__(self)
 

=== modified file 'kiwi/ui/delegates.py'
--- kiwi/ui/delegates.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/delegates.py	2012-05-04 16:37:18 +0000
@@ -29,6 +29,7 @@
 from kiwi.controllers import BaseController
 from kiwi.python import deprecationwarn
 
+
 class Delegate(BaseView, BaseController):
     """A class that combines view and controller functionality into a
     single package. The Delegate class possesses a top-level window.
@@ -54,6 +55,7 @@
                           delete_handler=delete_handler)
         BaseController.__init__(self, view=self, keyactions=keyactions)
 
+
 class GladeDelegate(BaseView, BaseController):
     """A class that combines view and controller functionality into a
     single package. The Delegate class possesses a top-level window.
@@ -72,6 +74,7 @@
                           delete_handler=delete_handler)
         BaseController.__init__(self, view=self, keyactions=keyactions)
 
+
 class SlaveDelegate(SlaveView, BaseController):
     """A class that combines view and controller functionality into a
     single package. It does not possess a top-level window, but is instead
@@ -92,6 +95,7 @@
                            toplevel_name)
         BaseController.__init__(self, view=self, keyactions=keyactions)
 
+
 class GladeSlaveDelegate(SlaveView, BaseController):
     """A class that combines view and controller functionality into a
     single package. It does not possess a top-level window, but is instead
@@ -191,5 +195,3 @@
 
     def update(self, attribute):
         self.proxy.update(attribute)
-
-

=== modified file 'kiwi/ui/dialogs.py'
--- kiwi/ui/dialogs.py	2012-03-14 16:36:10 +0000
+++ kiwi/ui/dialogs.py	2012-05-04 16:37:18 +0000
@@ -33,10 +33,10 @@
 
 _IMAGE_TYPES = {
     gtk.MESSAGE_INFO: gtk.STOCK_DIALOG_INFO,
-    gtk.MESSAGE_WARNING : gtk.STOCK_DIALOG_WARNING,
-    gtk.MESSAGE_QUESTION : gtk.STOCK_DIALOG_QUESTION,
-    gtk.MESSAGE_ERROR : gtk.STOCK_DIALOG_ERROR,
-}
+    gtk.MESSAGE_WARNING: gtk.STOCK_DIALOG_WARNING,
+    gtk.MESSAGE_QUESTION: gtk.STOCK_DIALOG_QUESTION,
+    gtk.MESSAGE_ERROR: gtk.STOCK_DIALOG_ERROR,
+    }
 
 _BUTTON_TYPES = {
     gtk.BUTTONS_NONE: (),
@@ -49,6 +49,7 @@
                             gtk.STOCK_OK, gtk.RESPONSE_OK)
     }
 
+
 class HIGAlertDialog(gtk.Dialog):
     def __init__(self, parent, flags,
                  type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_NONE):
@@ -128,6 +129,7 @@
         widget.show()
         self._expander.show()
 
+
 class BaseDialog(gtk.Dialog):
     def __init__(self, parent=None, title='', flags=0, buttons=()):
         if parent and not isinstance(parent, (gtk.Window, gtk.Dialog)):
@@ -143,6 +145,7 @@
         self.set_has_separator(False)
         self.vbox.set_spacing(6)
 
+
 def messagedialog(dialog_type, short, long=None, parent=None,
                   buttons=gtk.BUTTONS_OK, default=-1):
     """Create and show a MessageDialog.
@@ -210,6 +213,7 @@
     d.destroy()
     return response
 
+
 def _simple(type, short, long=None, parent=None, buttons=gtk.BUTTONS_OK,
           default=-1):
     if buttons == gtk.BUTTONS_OK:
@@ -218,23 +222,28 @@
                          parent=parent, buttons=buttons,
                          default=default)
 
+
 def error(short, long=None, parent=None, buttons=gtk.BUTTONS_OK, default=-1):
     return _simple(gtk.MESSAGE_ERROR, short, long, parent=parent,
                    buttons=buttons, default=default)
 
+
 def info(short, long=None, parent=None, buttons=gtk.BUTTONS_OK, default=-1):
     return _simple(gtk.MESSAGE_INFO, short, long, parent=parent,
                    buttons=buttons, default=default)
 
+
 def warning(short, long=None, parent=None, buttons=gtk.BUTTONS_OK, default=-1):
     return _simple(gtk.MESSAGE_WARNING, short, long, parent=parent,
                    buttons=buttons, default=default)
 
+
 def yesno(text, parent=None, default=gtk.RESPONSE_YES,
           buttons=gtk.BUTTONS_YES_NO):
     return messagedialog(gtk.MESSAGE_WARNING, text, None, parent,
                          buttons=buttons, default=default)
 
+
 def open(title='', parent=None, patterns=None, folder=None, filter=None,
          with_file_chooser=False):
     """Displays an open dialog.
@@ -294,6 +303,7 @@
     filechooser.destroy()
     return
 
+
 def selectfolder(title='', parent=None, folder=None):
     """Displays a select folder dialog.
     :param title: the title of the folder, defaults to 'Select folder'
@@ -332,6 +342,7 @@
     filechooser.destroy()
     return
 
+
 def ask_overwrite(filename, parent=None):
     submsg1 = _('A file named "%s" already exists') % os.path.abspath(filename)
     submsg2 = _('Do you wish to replace it with the current one?')
@@ -344,6 +355,7 @@
                                      gtk.RESPONSE_YES)))
     return result == gtk.RESPONSE_YES
 
+
 def save(title='', parent=None, current_name='', folder=None):
     """Displays a save dialog."""
     filechooser = gtk.FileChooserDialog(title or _('Save'),
@@ -374,6 +386,7 @@
     filechooser.destroy()
     return path
 
+
 def password(primary='', secondary='', parent=None):
     """
     Shows a password dialog and returns the password entered in the dialog
@@ -424,6 +437,7 @@
     d.destroy()
     return password
 
+
 def _test():
     yesno('Kill?', default=gtk.RESPONSE_NO)
 

=== modified file 'kiwi/ui/entry.py'
--- kiwi/ui/entry.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/entry.py	2012-05-04 16:37:18 +0000
@@ -134,10 +134,10 @@
 #  C - Alpha, optional
 
 INPUT_CHAR_MAP = {
-    INPUT_ASCII_LETTER:     lambda text: text in string.ascii_letters,
-    INPUT_ALPHA:            unicode.isalpha,
-    INPUT_ALPHANUMERIC:     unicode.isalnum,
-    INPUT_DIGIT:            unicode.isdigit,
+    INPUT_ASCII_LETTER: lambda text: text in string.ascii_letters,
+    INPUT_ALPHA: unicode.isalpha,
+    INPUT_ALPHANUMERIC: unicode.isalnum,
+    INPUT_DIGIT: unicode.isdigit,
     }
 
 
@@ -150,6 +150,7 @@
 
 _ = lambda msg: gettext.dgettext('kiwi', msg)
 
+
 class KiwiEntry(gtk.Entry):
     """
     The KiwiEntry is a Entry subclass with the following additions:
@@ -235,7 +236,7 @@
         try:
             self.set_mask(value)
             return self.get_mask()
-        except MaskError, e:
+        except MaskError:
             pass
     mask = gobject.property(getter=_get_mask,
                             setter=_set_mask,
@@ -265,7 +266,6 @@
 
         self._really_delete_text(0, -1)
         if not self._mask:
-            new_text = text
             self._really_insert_text(text, 0)
             return
 
@@ -292,7 +292,7 @@
                 to_insert[pos] = t
 
         self._really_insert_text(''.join(to_insert), 0)
-        self.set_position(pos+1)
+        self.set_position(pos + 1)
 
     # Mask & Fields
 
@@ -327,7 +327,6 @@
 
         mask = unicode(mask)
         input_length = len(mask)
-        lenght = 0
         pos = 0
         field_begin = 0
         field_end = 0
@@ -429,7 +428,7 @@
     def _get_field_ideal_pos(self, field):
         start, end = self._mask_fields[field]
         text = self.get_field_text(field)
-        pos = start+len(text)
+        pos = start + len(text)
         return pos
 
     def get_field(self):
@@ -446,7 +445,6 @@
         self.set_position(pos)
 
         if select:
-            field_text = self.get_field_text(field)
             start, end = self._mask_fields[field]
             self.select_region(start, pos)
 
@@ -492,7 +490,7 @@
                 # Otherwise, when shifting right, the char will be
                 # prepended.
                 next_pos = self._get_next_non_static_char_pos(i, direction,
-                                                              positions-1)
+                                                              positions - 1)
 
                 # If its outside the bounds of the region, ignore it.
                 if not start <= next_pos <= end:
@@ -512,9 +510,9 @@
             else:
                 # Keep the static char where it is.
                 if direction == Direction.LEFT:
-                   new_text = new_text + text[i]
+                    new_text = new_text + text[i]
                 else:
-                   new_text = text[i] + new_text
+                    new_text = text[i] + new_text
             i += direction
 
         return new_text
@@ -528,7 +526,7 @@
         """
         text = self.get_text()
         validators = self._mask_validators
-        i = pos+direction+skip
+        i = pos + direction + skip
         while 0 <= i < len(text):
             if isinstance(validators[i], int):
                 return i
@@ -765,7 +763,7 @@
         # position after that static char.
         if (self._confirms_to_mask(pos, new) and
             not isinstance(validators[pos], int)):
-            return pos+1
+            return pos + 1
 
         # If does not confirms to mask:
         #  - Check if the char the user just tried to enter appers later.
@@ -773,7 +771,7 @@
         if not self._confirms_to_mask(pos, new):
             field = self._appers_later(new, pos)
             if field is not False:
-                pos = self.get_field_pos(field+1)
+                pos = self.get_field_pos(field + 1)
                 if pos is not None:
                     gobject.idle_add(self.set_position, pos)
             return pos
@@ -793,7 +791,6 @@
                     and the new text.
         """
         field = self._get_field_at_pos(pos)
-        length = len(new)
         new_pos = pos
         start, end = self._mask_fields[field]
 
@@ -803,16 +800,17 @@
                     text[end:])
 
         # Overwrite Right
-#        new_text = (text[:pos] + new +
-#                    text[pos+length:end]+
-#                    text[end:])
-        new_pos = pos+1
+        #length = len(new)
+        #new_text = (text[:pos] + new +
+        #            text[pos+length:end]+
+        #            text[end:])
+        new_pos = pos + 1
         gobject.idle_add(self.set_position, new_pos)
 
         # If the field is full, jump to the next field
-        if len(self.get_field_text(field)) == self.get_field_length(field)-1:
-            gobject.idle_add(self.set_field, field+1, True)
-            self.set_field(field+1)
+        if len(self.get_field_text(field)) == self.get_field_length(field) - 1:
+            gobject.idle_add(self.set_field, field + 1, True)
+            self.set_field(field + 1)
 
         return new_pos, new_text
 
@@ -830,8 +828,8 @@
             else:
                 self._icon_pos = gtk.POS_LEFT
 
-
     # Callbacks
+
     def _on_insert_text(self, editable, new, length, position):
         if not self._mask or self._block_insert:
             return
@@ -867,16 +865,16 @@
         if (0 < start < len(self._mask_validators)
             and not isinstance(self._mask_validators[start], int)
             and pos != start):
-            self._on_delete_text(editable, start-1, start)
+            self._on_delete_text(editable, start - 1, start)
             return
 
         # we just tried to delete, stop the selection.
         self._selecting = False
 
-        field = self._get_field_at_pos(end-1)
+        field = self._get_field_at_pos(end - 1)
         # Outside a field. Cannot delete.
         if field is None:
-            self.set_position(end-1)
+            self.set_position(end - 1)
             return
         _start, _end = self._mask_fields[field]
 
@@ -890,16 +888,16 @@
         # Shift Left
         new_text = (text[:start] +
                     self._shift_text(start, _end, Direction.LEFT,
-                                     end-start) +
+                                     end - start) +
                     text[_end:])
 
         # Overwrite Left
-#        empty_mask = self.get_empty_mask()
-#        new_text = (text[:_start] +
-#                    text[_start:start] +
-#                    empty_mask[start:start+(end-start)] +
-#                    text[start+(end-start):_end] +
-#                    text[_end:])
+        #empty_mask = self.get_empty_mask()
+        #new_text = (text[:_start] +
+        #            text[_start:start] +
+        #            empty_mask[start:start+(end-start)] +
+        #            text[start+(end-start):_end] +
+        #            text[_end:])
 
         new_pos = start
 
@@ -942,7 +940,7 @@
             return False
 
         if field < 0:
-            field = len(self._mask_fields)-1
+            field = len(self._mask_fields) - 1
 
         # grab_focus changes the selection, so we need to grab_focus before
         # making the selection.
@@ -1153,9 +1151,11 @@
 
 type_register(KiwiEntry)
 
+
 def main(args):
     win = gtk.Window()
     win.set_title('gtk.Entry subclass')
+
     def cb(window, event):
         print 'fields', widget.get_field_text()
         gtk.main_quit()

=== modified file 'kiwi/ui/entrycompletion.py'
--- kiwi/ui/entrycompletion.py	2012-03-15 17:58:30 +0000
+++ kiwi/ui/entrycompletion.py	2012-05-04 16:37:18 +0000
@@ -31,6 +31,7 @@
 COMPLETION_TIMEOUT = 300
 PAGE_INCREMENT = 14
 
+
 class KiwiEntryCompletion(gtk.EntryCompletion):
     def __init__(self):
         gtk.EntryCompletion.__init__(self)
@@ -51,6 +52,7 @@
         self._selected_index = -1
 
     gsignal('match-selected', 'override')
+
     def do_match_selected(self, model, iter):
         self._entry.set_text(model[iter][0])
         return True
@@ -149,14 +151,14 @@
         if keyval == keysyms.Up or keyval == keysyms.KP_Up:
             index -= 1
             if index < -1:
-                index = matches -1
+                index = matches - 1
 
             self._select_item(index)
             return True
 
         elif keyval == keysyms.Down or keyval == keysyms.KP_Down:
             index += 1
-            if index > matches-1:
+            if index > matches - 1:
                 index = -1
 
             self._select_item(index)
@@ -164,7 +166,7 @@
 
         elif keyval == keysyms.Page_Up:
             if index < 0:
-                index = matches-1
+                index = matches - 1
             elif index > 0 and index - PAGE_INCREMENT < 0:
                 index = 0
             else:
@@ -179,8 +181,8 @@
         elif keyval == keysyms.Page_Down:
             if index < 0:
                 index = 0
-            elif index < matches-1 and index + PAGE_INCREMENT > matches - 1:
-                index = matches -1
+            elif index < matches - 1 and index + PAGE_INCREMENT > matches - 1:
+                index = matches - 1
             else:
                 index += PAGE_INCREMENT
 
@@ -221,7 +223,7 @@
             if gdk.keyboard_grab(window, True, activate_time) == 0:
                 return True
             else:
-                window.get_display().pointer_ungrab(activate_time);
+                window.get_display().pointer_ungrab(activate_time)
                 return False
         return False
 
@@ -240,7 +242,7 @@
         self._filter_model.refilter()
         self._treeview.set_model(self._filter_model)
         if self._treeview.flags() & gtk.REALIZED:
-            self._treeview.scroll_to_point(0,0)
+            self._treeview.scroll_to_point(0, 0)
 
     def set_entry(self, entry):
         self._entry = entry

=== modified file 'kiwi/ui/gadgets.py'
--- kiwi/ui/gadgets.py	2012-02-21 14:01:42 +0000
+++ kiwi/ui/gadgets.py	2012-05-04 16:37:18 +0000
@@ -37,12 +37,14 @@
 from kiwi.utils import gsignal, type_register
 from kiwi.ui.pixbufutils import pixbuf_from_string
 
+
 def gdk_color_to_string(color):
     """Convert a color to a #AABBCC string"""
     return "#%02X%02X%02X" % (int(color.red) >> 8,
                               int(color.green) >> 8,
                               int(color.blue) >> 8)
 
+
 def set_foreground(widget, color, state=gtk.STATE_NORMAL):
     """
     Set the foreground color of a widget:
@@ -53,12 +55,14 @@
     """
     widget.modify_fg(state, gdk.color_parse(color))
 
+
 def get_foreground(widget, state=gtk.STATE_NORMAL):
     """Return the foreground color of the widget as a string"""
     style = widget.get_style()
     color = style.fg[state]
     return gdk_color_to_string(color)
 
+
 def set_background(widget, color, state=gtk.STATE_NORMAL):
     """
     Set the background color of a widget:
@@ -72,12 +76,14 @@
     else:
         widget.modify_bg(state, gdk.color_parse(color))
 
+
 def get_background(widget, state=gtk.STATE_NORMAL):
     """Return the background color of the widget as a string"""
     style = widget.get_style()
     color = style.bg[state]
     return gdk_color_to_string(color)
 
+
 def quit_if_last(*args):
     windows = [toplevel
                for toplevel in gtk.window_list_toplevels()
@@ -85,14 +91,17 @@
     if len(windows) == 1:
         gtk.main_quit()
 
+
 def _select_notebook_tab(widget, event, notebook):
     val = event.keyval - 48
     if event.state & gdk.MOD1_MASK and 1 <= val <= 9:
-        notebook.set_current_page(val-1)
+        notebook.set_current_page(val - 1)
+
 
 def register_notebook_shortcuts(dialog, notebook):
     dialog.toplevel.connect('key-press-event', _select_notebook_tab, notebook)
 
+
 class FadeOut(gobject.GObject):
     """I am a helper class to draw the fading effect of the background
     Call my methods start() and stop() to control the fading.
@@ -199,6 +208,7 @@
 
 _pixbuf_cache = {}
 
+
 # Based on code from BillReminder by Og Maciel and
 # http://cairographics.org/cookbook/roundedrectangles/
 

=== modified file 'kiwi/ui/gaxmlloader.py'
--- kiwi/ui/gaxmlloader.py	2007-05-29 14:16:15 +0000
+++ kiwi/ui/gaxmlloader.py	2012-05-04 16:37:18 +0000
@@ -27,6 +27,7 @@
 
 log = Logger('gaxmlparser')
 
+
 class GAXMLWidgetTree(object):
     def __init__(self, view, gladefile, domain=None):
         self._view = view

=== modified file 'kiwi/ui/hyperlink.py'
--- kiwi/ui/hyperlink.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/hyperlink.py	2012-05-04 16:37:18 +0000
@@ -34,6 +34,7 @@
 
 import gobject
 
+
 class HyperLink(gtk.EventBox):
     __gtype_name__ = 'HyperLink'
     """

=== modified file 'kiwi/ui/libgladeloader.py'
--- kiwi/ui/libgladeloader.py	2006-09-11 17:11:15 +0000
+++ kiwi/ui/libgladeloader.py	2012-05-04 16:37:18 +0000
@@ -27,6 +27,7 @@
 
 log = Logger('libgladeloader')
 
+
 class LibgladeWidgetTree(XML):
     def __init__(self, view, gladefile, domain=None):
         self._view = view

=== modified file 'kiwi/ui/objectlist.py'
--- kiwi/ui/objectlist.py	2012-03-29 18:02:10 +0000
+++ kiwi/ui/objectlist.py	2012-05-04 16:37:18 +0000
@@ -49,12 +49,14 @@
 
 log = Logger('objectlist')
 
+
 def str2enum(value_name, enum_class):
     "converts a string to a enum"
     for _, _enum in enum_class.__enum_values__.items():
         if value_name in (_enum.value_name, _enum.value_nick):
             return _enum
 
+
 def str2bool(value, from_string=converter.from_string):
     "converts a boolean to a enum"
     return from_string(bool, value)
@@ -162,7 +164,7 @@
     visible = gobject.property(type=bool, default=True)
     justify = gobject.property(type=gtk.Justification, default=gtk.JUSTIFY_LEFT)
     format = gobject.property(type=str)
-    width = gobject.property(type=int, maximum=2**16)
+    width = gobject.property(type=int, maximum=2 ** 16)
     sorted = gobject.property(type=bool, default=False)
     order = gobject.property(type=gtk.SortType, default=gtk.SORT_ASCENDING)
     expand = gobject.property(type=bool, default=False)
@@ -664,7 +666,6 @@
         renderer.set_property('digits', digits)
 
 
-
 class SequentialColumn(Column):
     """I am a column which will display a sequence of numbers, which
     represent the row number. The value is independent of the data in
@@ -696,6 +697,7 @@
             raise TypeError("%r does not support parameter %s" %
                             (renderer, renderer_prop))
 
+
 class SearchColumn(Column):
     """
     I am a column that should be used in conjunction with
@@ -725,7 +727,6 @@
         Column.__init__(self, attribute, title, data_type, **kwargs)
 
 
-
 class ColoredColumn(Column):
     """
     I am a column which can colorize the text of columns under
@@ -779,6 +780,7 @@
 
         renderer.set_property('foreground-gdk', color)
 
+
 class _ContextMenu(gtk.Menu):
 
     """
@@ -868,6 +870,7 @@
 
 _marker = object()
 
+
 class ObjectList(gtk.HBox):
     """
     An enhanced version of GtkTreeView, which provides pythonic wrappers
@@ -1230,7 +1233,6 @@
                                       default=gtk.SELECTION_BROWSE,
                                       nick="SelectionMode")
 
-
     # Columns handling
 
     def _load(self, instances, clear):
@@ -1498,7 +1500,6 @@
             if item:
                 self.emit('double-click', item)
 
-
     def _on_treeview__source_drag_data_get(self, treeview, context,
                                            selection, info, timestamp):
         item = self.get_selected()
@@ -1696,7 +1697,6 @@
         if not objid in self._iters:
             raise ValueError("instance %r is not in the list" % instance)
 
-
         if select:
             prev = self.get_previous(instance)
             rv = self._remove(objid)
@@ -2236,6 +2236,7 @@
 
 type_register(ObjectTree)
 
+
 class ListLabel(gtk.HBox):
     """I am a subclass of a GtkHBox which you can use if you want
     to vertically align a label with a column

=== modified file 'kiwi/ui/pixbufutils.py'
--- kiwi/ui/pixbufutils.py	2012-02-24 16:19:39 +0000
+++ kiwi/ui/pixbufutils.py	2012-05-04 16:37:18 +0000
@@ -21,9 +21,9 @@
 # Author(s): Johan Dahlin <[e-mail]>
 #
 
-
 from gtk import gdk
 
+
 def pixbuf_from_string(pixbuf_data, format='png', width=None, height=None):
     loader = gdk.PixbufLoader(format)
     loader.write(pixbuf_data)

=== modified file 'kiwi/ui/proxy.py'
--- kiwi/ui/proxy.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/proxy.py	2012-05-04 16:37:18 +0000
@@ -38,10 +38,12 @@
 from kiwi.interfaces import IProxyWidget, IValidatableProxyWidget
 from kiwi.log import Logger
 
+log = Logger('proxy')
+
+
 class ProxyError(Exception):
     pass
 
-log = Logger('proxy')
 
 def block_widget(widget):
     """Blocks the signal handler of the 'content-changed' signal on widget"""
@@ -49,17 +51,20 @@
     if connection_id:
         widget.handler_block(connection_id)
 
+
 def unblock_widget(widget):
     """Unblocks the signal handler of the 'content-changed' signal on widget"""
     connection_id = widget.get_data('content-changed-id')
     if connection_id:
         widget.handler_unblock(connection_id)
 
+
 def _get_widget_data_type(widget):
     data_type = widget.get_property('data-type')
     c = converter.get_converter(data_type)
     return c.type
 
+
 class Proxy:
     """ A Proxy is a class that 'attaches' an instance to an interface's
     widgets, and transparently manipulates that instance's attributes as
@@ -301,7 +306,6 @@
                                  % (attribute, self,
                                     self._model_attributes.keys()))
 
-
         # The type of value should match the data-type property. The two
         # exceptions to this rule are ValueUnset and None
         if not (value is ValueUnset or value is None):
@@ -392,4 +396,3 @@
     def new_model(self, model, relax_type=False):
         self.set_model(model)
     new_model = deprecated('set_model', log)(new_model)
-

=== modified file 'kiwi/ui/proxywidget.py'
--- kiwi/ui/proxywidget.py	2012-05-02 14:43:32 +0000
+++ kiwi/ui/proxywidget.py	2012-05-04 16:37:18 +0000
@@ -46,6 +46,7 @@
 
 _ = lambda m: gettext.dgettext('kiwi', m)
 
+
 class _PixbufConverter(BaseConverter):
     type = gdk.Pixbuf
     name = 'Pixbuf'
@@ -161,7 +162,7 @@
             conv = converter.get_converter(str)
 
         return conv.as_string(data, format=self._data_format,
-                              **self._converter_options.get(conv.type,{}))
+                              **self._converter_options.get(conv.type, {}))
 
     def _from_string(self, data):
         """Convert a string to the data type of the widget
@@ -190,6 +191,7 @@
 
 _error_icon = None
 
+
 def _load_error_icon():
     global _error_icon
     if _error_icon is None:

=== modified file 'kiwi/ui/search.py'
--- kiwi/ui/search.py	2012-04-10 19:23:10 +0000
+++ kiwi/ui/search.py	2012-05-04 16:37:18 +0000
@@ -73,6 +73,7 @@
         :rtype: datetime.date tuple
         """
 
+
 class Any(DateSearchOption):
     name = _('Any')
 
@@ -160,6 +161,7 @@
         :returns: start, end
         """
 
+
 class Between(NumberSearchOption):
     name = _('Between')
     numbers = 2
@@ -285,6 +287,7 @@
     Can be customized through add_option.
     """
     __gtype_name__ = 'DateSearchFilter'
+
     class Type(enum):
         (USER_DAY,
          USER_INTERVAL) = range(100, 102)
@@ -366,7 +369,7 @@
                                           _(u'to'), end_date.strftime('%x'),)
 
             else:
-                 desc += start_date.strftime('%x')
+                desc += start_date.strftime('%x')
         if desc:
             return '%s %s' % (self.get_title_label().get_text(), desc,)
 
@@ -404,7 +407,6 @@
                            dict(name=name, date=date))
         self.add_option(option_type, position=position)
 
-
     def add_option_fixed_interval(self, name, start, end, position=-2):
         """
         Adds a fixed option interval, eg one for which the dates are not
@@ -732,6 +734,7 @@
 
 gobject.type_register(HintedEntry)
 
+
 class StringSearchFilter(SearchFilter):
     """
     - a label
@@ -879,7 +882,7 @@
 
         self.start = gtk.SpinButton(climb_rate=1.0)
         self.start.get_adjustment().step_increment = 1.0
-        self.start.set_range(-sys.maxint-1, sys.maxint)
+        self.start.set_range(-sys.maxint - 1, sys.maxint)
         self.pack_start(self.start, False, False, 6)
         self.start.show()
         self.start.connect_after('activate', self._on_entry__activate)
@@ -890,7 +893,7 @@
 
         self.end = gtk.SpinButton(climb_rate=1.0)
         self.end.get_adjustment().step_increment = 1.0
-        self.end.set_range(-sys.maxint-1, sys.maxint)
+        self.end.set_range(-sys.maxint - 1, sys.maxint)
         self.pack_start(self.end, False, False, 6)
         self.end.show()
         self.end.connect_after('activate', self._on_entry__activate)
@@ -928,7 +931,6 @@
             self.and_label.show()
             self.end.show()
 
-
     #
     #   Callbacks
     #
@@ -1085,7 +1087,6 @@
 
         self._create_ui()
 
-
     #
     # GObject
     #
@@ -1124,7 +1125,6 @@
         else:
             raise AssertionError(pspec.name)
 
-
     #
     # Public API
     #
@@ -1138,7 +1138,6 @@
         :param columns:
         :param callback:
         """
-
         if not isinstance(search_filter, SearchFilter):
             raise TypeError("search_filter must be a SearchFilter subclass, "
                             "not %r" % (search_filter,))
@@ -1351,7 +1350,6 @@
                 continue
             search_filter.set_state(**filter_state)
 
-
     #
     # Callbacks
     #

=== modified file 'kiwi/ui/test/common.py'
--- kiwi/ui/test/common.py	2012-03-13 20:18:46 +0000
+++ kiwi/ui/test/common.py	2012-05-04 16:37:18 +0000
@@ -41,6 +41,7 @@
     except ImportError:
         event_handler_set = None
 
+
 class WidgetIntrospecter(gobject.GObject):
     gsignal('window-added', object, str, object)
     gsignal('window-removed', object, str)

=== modified file 'kiwi/ui/test/main.py'
--- kiwi/ui/test/main.py	2006-11-21 16:21:07 +0000
+++ kiwi/ui/test/main.py	2012-05-04 16:37:18 +0000
@@ -27,17 +27,20 @@
 
 from kiwi.log import set_log_level
 
+
 def _play(options, filename, args):
     from kiwi.ui.test.runner import play_file
 
     play_file(filename, options.command, args)
 
+
 def _record(options, filename, args):
     from kiwi.ui.test.recorder import Recorder
 
     recorder = Recorder(filename)
     recorder.execute(args)
 
+
 def main(args):
     parser = optparse.OptionParser()
     parser.add_option('', '--command', action="store",

=== modified file 'kiwi/ui/test/recorder.py'
--- kiwi/ui/test/recorder.py	2012-04-10 18:14:36 +0000
+++ kiwi/ui/test/recorder.py	2012-05-04 16:37:18 +0000
@@ -59,6 +59,7 @@
 
 log = Logger('recorder')
 
+
 def register_event_type(event_type):
     """
     Add an event type to a list of event types.
@@ -69,6 +70,7 @@
         raise AssertionError("event %s already registered" % event_type)
     _events.append(event_type)
 
+
 def get_event_types():
     """
     Returns the collection of event types.
@@ -76,9 +78,11 @@
     """
     return _events
 
+
 class SkipEvent(Exception):
     pass
 
+
 class Event(object):
     """
     Event is a base class for all events.
@@ -87,6 +91,7 @@
       automatically attach events to objects when they appear
     """
     object_type = None
+
     def __init__(self, object, name=None):
         """
         Create a new Event object.
@@ -125,6 +130,7 @@
         """
         pass
 
+
 class SignalEvent(Event):
     """
     A SignalEvent is an :class:`Event` which is tied to a GObject signal,
@@ -134,6 +140,7 @@
     :cvar signal_name: signal to listen to
     """
     signal_name = None
+
     def __init__(self, object, name, args):
         """
         Create a new SignalEvent object.
@@ -155,6 +162,7 @@
         """
         object.connect(signal_name, cb, cls, object)
 
+
 #
 # Special Events
 #
@@ -165,6 +173,7 @@
     window manager.
     """
 
+
 #
 # Signal Events
 #
@@ -179,8 +188,10 @@
 
     def serialize(self):
         return '%s.activate()' % self.name
+
 register_event_type(MenuItemActivateEvent)
 
+
 class ImageMenuItemButtonReleaseEvent(SignalEvent):
     """
     This event represents a click on a normal menu entry
@@ -204,8 +215,10 @@
 
     def serialize(self):
         return '%s.activate()' % self.name
+
 register_event_type(ImageMenuItemButtonReleaseEvent)
 
+
 class ToolButtonReleaseEvent(SignalEvent):
     """
     This event represents a click on a normal toolbar button
@@ -216,8 +229,10 @@
 
     def serialize(self):
         return '%s.activate()' % self.name
+
 register_event_type(ToolButtonReleaseEvent)
 
+
 class EntrySetTextEvent(SignalEvent):
     """
     This event represents a content modification of a GtkEntry.
@@ -233,8 +248,10 @@
 
     def serialize(self):
         return '%s.set_text("%s")' % (self.name, self.text)
+
 register_event_type(EntrySetTextEvent)
 
+
 class EntryActivateEvent(SignalEvent):
     """
     This event represents an activate event for a GtkEntry, eg when
@@ -246,8 +263,10 @@
 
     def serialize(self):
         return '%s.activate()' % (self.name)
+
 register_event_type(EntryActivateEvent)
 
+
 # Also works for Toggle, Radio and Check
 class ButtonClickedEvent(SignalEvent):
     """
@@ -260,8 +279,10 @@
 
     def serialize(self):
         return '%s.clicked()' % self.name
+
 register_event_type(ButtonClickedEvent)
 
+
 # Kiwi widget support
 class ObjectListSelectionChanged(SignalEvent):
     """
@@ -272,6 +293,7 @@
     """
     object_type = ObjectList
     signal_name = 'changed'
+
     def __init__(self, objectlist, name, args):
         self._objectlist = objectlist
         SignalEvent.__init__(self, objectlist, name=objectlist.get_name(),
@@ -305,8 +327,10 @@
 
     def serialize(self):
         return '%s.select_paths(%s)' % (self.name, self.rows)
+
 register_event_type(ObjectListSelectionChanged)
 
+
 class ObjectListDoubleClick(SignalEvent):
     """
     This event represents a double click on a row in objectlist
@@ -350,6 +374,7 @@
 
 # register_event_type(KiwiComboBoxChangedEvent)
 
+
 class Recorder(WidgetIntrospecter):
     """
     Recorder takes care of attaching events to widgets, when the appear,

=== modified file 'kiwi/ui/test/runner.py'
--- kiwi/ui/test/runner.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/test/runner.py	2012-05-04 16:37:18 +0000
@@ -39,12 +39,15 @@
 
 log = Logger('kiwi.ui.test.player')
 
+
 class NotReadyYet(Exception):
     pass
 
+
 class MissingWidget(KeyError):
     pass
 
+
 class MagicWindowWrapper(object):
     def __init__(self, window, ns):
         self.window = window
@@ -58,6 +61,7 @@
             raise MissingWidget(attr)
         return self.ns[attr]
 
+
 # Override some StringIO methods.
 class _SpoofOut(StringIO):
     def getvalue(self):
@@ -73,11 +77,12 @@
             del self.softspace
         return result
 
-    def truncate(self,   size=None):
+    def truncate(self, size=None):
         StringIO.truncate(self, size)
         if hasattr(self, "softspace"):
             del self.softspace
 
+
 class Runner(object):
     """
     Create a new Runner object.
@@ -228,6 +233,7 @@
 
 runner = None
 
+
 def play_file(script, filename=None, args=None):
     """
     Run an script.
@@ -249,7 +255,7 @@
         # run: ....
         pos = data.find('run:')
         if pos != -1:
-            rest = data[pos+5:]
+            rest = data[pos + 5:]
             # run: foo --arg
             if ' ' in rest:
                 filename, args = rest.split(' ', 1)

=== modified file 'kiwi/ui/tooltip.py'
--- kiwi/ui/tooltip.py	2011-07-04 19:41:22 +0000
+++ kiwi/ui/tooltip.py	2012-05-04 16:37:18 +0000
@@ -31,6 +31,7 @@
 DEFAULT_DELAY = 500
 BORDER_WIDTH = 4
 
+
 class Tooltip(gtk.Window):
     def __init__(self, widget):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
@@ -69,7 +70,7 @@
         monitor = screen.get_monitor_geometry(monitor_num)
 
         if (x + w) > monitor.x + monitor.width:
-            x -= (x + w) - (monitor.x + monitor.width);
+            x -= (x + w) - (monitor.x + monitor.width)
         elif x < monitor.x:
             x = monitor.x
 

=== modified file 'kiwi/ui/views.py'
--- kiwi/ui/views.py	2012-04-26 19:12:42 +0000
+++ kiwi/ui/views.py	2012-05-04 16:37:18 +0000
@@ -87,6 +87,7 @@
 
 method_regex = re.compile(r'^(on|after)_(\w+)__(\w+)$')
 
+
 class SignalBroker(object):
     def __init__(self, view, controller):
         methods = controller._get_all_methods()
@@ -136,7 +137,7 @@
                     signal_id = widget.connect_after(signal, methods[fname])
                 else:
                     raise AssertionError
-            except TypeError, e:
+            except TypeError:
                 raise TypeError("Widget %s doesn't provide a signal %s" % (
                                 widget.__class__, signal))
             self._autoconnected.setdefault(widget, []).append((
@@ -165,6 +166,7 @@
             for signal in signals:
                 widget.disconnect(signal[1])
 
+
 class GladeSignalBroker(SignalBroker):
     def _do_connections(self, view, methods):
         super(GladeSignalBroker, self)._do_connections(view, methods)
@@ -477,7 +479,7 @@
 
             if top_widget:
                 allocation = widget.allocation
-                top_allocation = getattr(top_widget, 'allocation',  None)
+                top_allocation = getattr(top_widget, 'allocation', None)
                 assert top_allocation != None
                 if (top_allocation[0] + top_allocation[1] >
                     allocation[0] + allocation[1]):
@@ -533,8 +535,8 @@
 
         if name in self.slaves:
             # XXX: TypeError
-            log.warn("A slave with name %s is already attached to %r"  % (
-                name, self))
+            log.warn("A slave with name %s is already attached to %r" % (
+                     name, self))
         self.slaves[name] = slave
 
         if not isinstance(slave, SlaveView):
@@ -681,8 +683,6 @@
     def get_slave(self, holder):
         return self.slaves.get(holder)
 
-
-
     #
     # Signal connection
     #
@@ -864,6 +864,7 @@
 
 type_register(SlaveView)
 
+
 class BaseView(SlaveView):
     """A view with a toplevel window."""
 
@@ -988,10 +989,12 @@
 
 _glade_loader_func = None
 
+
 def set_glade_loader_func(func):
     global _glade_loader_func
     _glade_loader_func = func
 
+
 def _get_libglade():
     try:
         from kiwi.ui.libgladeloader import LibgladeWidgetTree
@@ -999,6 +1002,7 @@
         return
     return LibgladeWidgetTree
 
+
 def _get_gaxml():
     try:
         from kiwi.ui.gaxmlloader import GAXMLWidgetTree
@@ -1006,6 +1010,7 @@
         return
     return GAXMLWidgetTree
 
+
 def _get_builder():
     try:
         from kiwi.ui.builderloader import BuilderWidgetTree
@@ -1013,6 +1018,7 @@
         return
     return BuilderWidgetTree
 
+
 def _open_glade(view, gladefile, domain):
     if not gladefile:
         raise ValueError("A gladefile wasn't provided.")
@@ -1033,7 +1039,6 @@
         except EnvironmentError:
             gladefile = environ.find_resource("glade", filename + '.ui')
 
-
     fp = open(gladefile)
     sniff = fp.read(200)
     fp.close()

=== modified file 'kiwi/ui/widgets/button.py'
--- kiwi/ui/widgets/button.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/button.py	2012-05-04 16:37:18 +0000
@@ -34,6 +34,7 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 from kiwi.utils import gsignal
 
+
 class ProxyButton(gtk.Button, ProxyWidgetMixin):
     """
     A ProxyButton is a Button subclass which is implementing the features
@@ -98,4 +99,3 @@
             self.set_label(text)
 
         self.emit('content-changed')
-

=== modified file 'kiwi/ui/widgets/checkbutton.py'
--- kiwi/ui/widgets/checkbutton.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/checkbutton.py	2012-05-04 16:37:18 +0000
@@ -34,6 +34,7 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 from kiwi.utils import gsignal, type_register
 
+
 class ProxyCheckButton(gtk.CheckButton, ProxyWidgetMixin):
     __gtype_name__ = 'ProxyCheckButton'
 
@@ -57,6 +58,7 @@
         self.props.data_type = bool
 
     gsignal('toggled', 'override')
+
     def do_toggled(self):
         self.emit('content-changed')
         self.chain()
@@ -66,16 +68,18 @@
 
     def update(self, data):
         if data is None or data is ValueUnset:
-            self.set_active(False);
+            self.set_active(False)
             return
 
         # No conversion to string needed, we only accept bool
         self.set_active(data)
 
+
 class CheckButton(ProxyCheckButton):
     def __init__(self):
         deprecationwarn(
             'CheckButton is deprecated, use ProxyCheckButton instead',
             stacklevel=3)
         ProxyCheckButton.__init__(self)
+
 type_register(CheckButton)

=== modified file 'kiwi/ui/widgets/colorbutton.py'
--- kiwi/ui/widgets/colorbutton.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/colorbutton.py	2012-05-04 16:37:18 +0000
@@ -42,6 +42,7 @@
         gtk.ColorButton.__init__(self, color)
 
     gsignal('color-set', 'override')
+
     def do_color_set(self):
         self.emit('content-changed')
         self.chain()

=== modified file 'kiwi/ui/widgets/combo.py'
--- kiwi/ui/widgets/combo.py	2012-05-02 17:00:01 +0000
+++ kiwi/ui/widgets/combo.py	2012-05-04 16:37:18 +0000
@@ -54,6 +54,7 @@
 from kiwi.ui.widgets.entry import ProxyEntry
 from kiwi.utils import gsignal
 
+
 class _EasyComboBoxHelper(object):
 
     implements(IEasyCombo)
@@ -191,7 +192,6 @@
             raise AssertionError
 
     def select(self, data):
-        mode = self.mode
         if self.mode == ComboMode.STRING:
             self.select_item_by_label(data)
         elif self.mode == ComboMode.DATA:
@@ -310,7 +310,6 @@
     def _on__changed(self, combo):
         self.emit('content-changed')
 
-
     def set_color_attribute(self, value):
         self._color_attribute = value
 
@@ -444,6 +443,7 @@
         """
         return self._helper.get_selected()
 
+
 class ProxyComboBoxEntry(BaseComboBoxEntry,
                          ValidatableProxyWidgetMixin):
     allowed_data_types = (basestring, object) + number
@@ -486,7 +486,6 @@
         self.set_events(gtk.gdk.KEY_RELEASE_MASK)
         self.connect("key-release-event", self._on__key_release_event)
 
-
     def __nonzero__(self):
         return True
 
@@ -510,7 +509,6 @@
                                      type=bool, default=True,
                                      nick="Editable")
 
-
     # Private
 
     def _update_selection(self, text=None):
@@ -668,6 +666,7 @@
 
         self._helper.set_mode(self, mode)
 
+
 class ProxyComboEntry(ComboEntry, ValidatableProxyWidgetMixin):
     __gtype_name__ = 'ProxyComboEntry'
     allowed_data_types = (basestring, object) + number

=== modified file 'kiwi/ui/widgets/combobox.py'
--- kiwi/ui/widgets/combobox.py	2006-08-29 18:19:55 +0000
+++ kiwi/ui/widgets/combobox.py	2012-05-04 16:37:18 +0000
@@ -30,8 +30,10 @@
 from kiwi.ui.widgets.combo import ProxyComboBox
 from kiwi.ui.widgets.combo import ProxyComboBoxEntry
 
+
 class ComboBox(ProxyComboBox):
     pass
 
+
 class ComboBoxEntry(ProxyComboBoxEntry):
     pass

=== modified file 'kiwi/ui/widgets/contextmenu.py'
--- kiwi/ui/widgets/contextmenu.py	2012-03-02 19:03:26 +0000
+++ kiwi/ui/widgets/contextmenu.py	2012-05-04 16:37:18 +0000
@@ -26,6 +26,7 @@
 
 from kiwi.utils import gsignal
 
+
 class ContextMenuItem(gtk.ImageMenuItem):
     gsignal('can-disable', retval=bool)
 
@@ -66,6 +67,7 @@
 
 gobject.type_register(ContextMenuItem)
 
+
 class ContextMenu(gtk.Menu):
 
     def append_separator(self):
@@ -83,5 +85,3 @@
 
             can_select = not menu_item.emit('can-disable')
             menu_item.set_sensitive(can_select)
-
-

=== modified file 'kiwi/ui/widgets/entry.py'
--- kiwi/ui/widgets/entry.py	2012-05-02 15:21:42 +0000
+++ kiwi/ui/widgets/entry.py	2012-05-04 16:37:18 +0000
@@ -41,12 +41,14 @@
      VALIDATION_ICON_WIDTH
 from kiwi.utils import gsignal, type_register
 
+
 class ProxyEntryMeta(gobject.GObjectMeta):
     def __call__(self, *args, **kwargs):
         rv = super(ProxyEntryMeta, self).__call__(*args, **kwargs)
         rv.__post_init__()
         return rv
 
+
 class ProxyEntry(KiwiEntry, ValidatableProxyWidgetMixin):
     """The Kiwi Entry widget has many special features that extend the basic
     gtk entry.
@@ -94,6 +96,7 @@
 
     # Virtual methods
     gsignal('changed', 'override')
+
     def do_changed(self):
         if self._block_changed:
             self.emit_stop_by_name('changed')
@@ -216,13 +219,16 @@
 
 type_register(ProxyEntry)
 
+
 class Entry(ProxyEntry):
     def __init__(self, data_type=None):
         deprecationwarn('Entry is deprecated, use ProxyEntry instead',
                         stacklevel=3)
         ProxyEntry.__init__(self, data_type)
+
 type_register(Entry)
 
+
 class ProxyDateEntry(DateEntry, ValidatableProxyWidgetMixin):
     __gtype_name__ = 'ProxyDateEntry'
 
@@ -261,6 +267,7 @@
                                    + int(icon_width / char_width))
 
     gsignal('changed', 'override')
+
     def do_changed(self):
         self.chain()
         self.emit('content-changed')

=== modified file 'kiwi/ui/widgets/filechooser.py'
--- kiwi/ui/widgets/filechooser.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/widgets/filechooser.py	2012-05-04 16:37:18 +0000
@@ -29,12 +29,14 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 from kiwi.utils import gsignal
 
+
 class _FileChooserMixin(object):
     """Mixin to use common methods of the FileChooser interface"""
 
     allowed_data_types = basestring,
 
     gsignal('selection_changed', 'override')
+
     def do_selection_changed(self):
         self.emit('content-changed')
         self.chain()
@@ -47,9 +49,11 @@
             return
         self.set_filename(data)
 
+
 class ProxyFileChooserWidget(_FileChooserMixin, gtk.FileChooserWidget,
                              ProxyWidgetMixin):
     __gtype_name__ = 'ProxyFileChooserWidget'
+
     def __init__(self, action=gtk.FILE_CHOOSER_ACTION_OPEN, backend=None):
         """
         Create a new ProxyFileChooserWidget object.
@@ -60,9 +64,11 @@
         self.props.data_type = str
         gtk.FileChooserWidget.__init__(self, action=action, backend=backend)
 
+
 class ProxyFileChooserButton(_FileChooserMixin, gtk.FileChooserButton,
                              ProxyWidgetMixin):
     __gtype_name__ = 'ProxyFileChooserButton'
+
     def __init__(self, title=None, backend=None, dialog=None):
         """
         Create a new ProxyFileChooserButton object.

=== modified file 'kiwi/ui/widgets/fontbutton.py'
--- kiwi/ui/widgets/fontbutton.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/fontbutton.py	2012-05-04 16:37:18 +0000
@@ -32,6 +32,7 @@
         self.props.data_type = str
 
     gsignal('font-set', 'override')
+
     def do_font_set(self):
         self.emit('content-changed')
         self.chain()
@@ -43,4 +44,3 @@
         self.set_font_name(data)
 
 type_register(ProxyFontButton)
-

=== modified file 'kiwi/ui/widgets/label.py'
--- kiwi/ui/widgets/label.py	2012-04-10 18:14:36 +0000
+++ kiwi/ui/widgets/label.py	2012-05-04 16:37:18 +0000
@@ -38,6 +38,7 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 from kiwi.utils import gsignal, type_register
 
+
 class ProxyLabel(gtk.Label, ProxyWidgetMixin):
     __gtype_name__ = 'ProxyLabel'
     model_attribute = gobject.property(type=str, blurb='Model attribute')
@@ -59,10 +60,10 @@
         ProxyWidgetMixin.__init__(self)
         self.props.data_type = data_type
         self.set_use_markup(True)
-        self._attr_dic = { "style": None,
-                           "weight": None,
-                           "size": None,
-                           "underline": None }
+        self._attr_dic = {"style": None,
+                          "weight": None,
+                          "size": None,
+                          "underline": None}
         self._size_list = ('xx-small', 'x-small',
                            'small', 'medium',
                            'large', 'x-large',
@@ -186,12 +187,15 @@
 
     def set_color(self, color):
         set_foreground(self, color)
+
 type_register(ProxyLabel)
 
+
 class Label(ProxyLabel):
     def __init__(self, label='', data_type=None):
         deprecationwarn(
             'Label is deprecated, use ProxyLabel instead',
             stacklevel=3)
         ProxyLabel.__init__(self, label=label, data_type=data_type)
+
 type_register(Label)

=== modified file 'kiwi/ui/widgets/list.py'
--- kiwi/ui/widgets/list.py	2006-03-22 14:39:56 +0000
+++ kiwi/ui/widgets/list.py	2012-05-04 16:37:18 +0000
@@ -34,6 +34,7 @@
 # pyflakes
 Column, SequentialColumn, ColoredColumn, ListLabel, SummaryLabel
 
+
 class List(ObjectList):
     def __init__(self, columns=[],
                  instance_list=None,
@@ -59,4 +60,3 @@
     def select_instance(self, *args, **kwargs):
         return self.select(*args, **kwargs)
     select_instance = deprecated('select', log)(select_instance)
-

=== modified file 'kiwi/ui/widgets/radiobutton.py'
--- kiwi/ui/widgets/radiobutton.py	2012-02-10 19:37:37 +0000
+++ kiwi/ui/widgets/radiobutton.py	2012-05-04 16:37:18 +0000
@@ -34,6 +34,7 @@
 from kiwi.utils import gsignal, type_register
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 
+
 class ProxyRadioButton(gtk.RadioButton, ProxyWidgetMixin):
     __gtype_name__ = 'ProxyRadioButton'
     allowed_data_types = object,
@@ -94,10 +95,12 @@
             if rb.get_property('data-value') == data:
                 rb.set_active(True)
 
+
 class RadioButton(ProxyRadioButton):
     def __init__(self):
         deprecationwarn(
             'RadioButton is deprecated, use ProxyRadioButton instead',
             stacklevel=3)
         ProxyRadioButton.__init__(self)
+
 type_register(RadioButton)

=== modified file 'kiwi/ui/widgets/scale.py'
--- kiwi/ui/widgets/scale.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/scale.py	2012-05-04 16:37:18 +0000
@@ -31,13 +31,14 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin
 from kiwi.utils import gsignal, type_register
 
+
 class _ProxyScale:
-
     # changed allowed data types because scales can only
     # accept float values
     allowed_data_types = float,
 
     gsignal('value_changed', 'override')
+
     def do_value_changed(self):
         self.emit('content-changed')
         self.chain()

=== modified file 'kiwi/ui/widgets/spinbutton.py'
--- kiwi/ui/widgets/spinbutton.py	2012-05-02 17:00:01 +0000
+++ kiwi/ui/widgets/spinbutton.py	2012-05-04 16:37:18 +0000
@@ -36,6 +36,7 @@
 from kiwi.ui.proxywidget import ProxyWidgetMixin, ValidatableProxyWidgetMixin
 from kiwi.utils import gsignal, type_register
 
+
 class ProxySpinButton(gtk.SpinButton, ValidatableProxyWidgetMixin):
     """
     A SpinButton subclass which adds supports for the Kiwi Framework.
@@ -66,6 +67,7 @@
         self.set_property('xalign', 1.0)
 
     gsignal('changed', 'override')
+
     def do_changed(self):
         """Called when the content of the spinbutton changes.
         """
@@ -112,4 +114,5 @@
             'SpinButton is deprecated, use ProxySpinButton instead',
             stacklevel=3)
         ProxySpinButton.__init__(self)
+
 type_register(SpinButton)

=== modified file 'kiwi/ui/widgets/textview.py'
--- kiwi/ui/widgets/textview.py	2011-06-24 20:16:58 +0000
+++ kiwi/ui/widgets/textview.py	2012-05-04 16:37:18 +0000
@@ -36,6 +36,7 @@
 from kiwi.ui.proxywidget import ValidatableProxyWidgetMixin
 from kiwi.utils import gsignal, type_register
 
+
 class ProxyTextView(gtk.TextView, ValidatableProxyWidgetMixin):
     __gtype_name__ = 'ProxyTextView'
     data_value = gobject.property(type=str, nick='Data Value')
@@ -49,6 +50,7 @@
     gsignal('validation-changed', bool)
     gsignal('validate', object, retval=object)
     allowed_data_types = (basestring, datetime.date) + number
+
     def __init__(self):
         self._is_unset = True
         gtk.TextView.__init__(self)
@@ -86,6 +88,7 @@
 
         self._textbuffer.set_text(text)
 
+
 class TextView(ProxyTextView):
     def __init__(self):
         deprecationwarn(

=== modified file 'kiwi/utils.py'
--- kiwi/utils.py	2012-02-10 19:37:37 +0000
+++ kiwi/utils.py	2012-05-04 16:37:18 +0000
@@ -33,21 +33,27 @@
 
 gprop = gobject.propertyhelper.property
 parent_type_from_parent = gprop._type_from_python
+parent_get_pspec_args = gprop.get_pspec_args
+
+
 def _type_from_python(self, type_):
     if issubclass(type_, gobject.GEnum):
         return type_.__gtype__
     else:
         return parent_type_from_parent(self, type_)
+
 gprop._type_from_python = _type_from_python
 
-parent_get_pspec_args = gprop.get_pspec_args
+
 def _get_pspec_args(self):
     if gobject.type_is_a(self.type, gobject.GEnum):
         return (self.type, self.nick, self.blurb, self.default, self.flags)
     else:
         return parent_get_pspec_args(self)
+
 gprop.get_pspec_args = _get_pspec_args
 
+
 def list_properties(gtype, parent=True):
     """
     Return a list of all properties for GType gtype, excluding
@@ -63,6 +69,7 @@
     return [pspec for pspec in pspecs
                       if pspec not in parent_pspecs]
 
+
 def type_register(gtype):
     """Register the type, but only if it's not already registered
     :param gtype: the class to register
@@ -77,6 +84,7 @@
 
     return True
 
+
 def gsignal(name, *args, **kwargs):
     """
     Add a GObject signal to the current object.
@@ -123,6 +131,7 @@
 
         dict[name] = (flags, retval, args)
 
+
 def quote(msg):
     """
     Similar to urllib.quote but for glibs GMarkup

=== modified file 'kiwiwidgets.py'
--- kiwiwidgets.py	2012-02-21 11:59:22 +0000
+++ kiwiwidgets.py	2012-05-04 16:37:18 +0000
@@ -29,6 +29,7 @@
 ProxyTextView
 ProxyButton
 
+
 def _get_icon_path():
     dirname = os.path.dirname(__file__)
     if not os.path.exists(os.path.join(dirname, '.svn')):
@@ -39,6 +40,7 @@
                                'resources', 'kiwiwidgets')
     return os.path.abspath(icondir)
 
+
 def _register_icons():
     icondir = _get_icon_path()
     for filename in glob.glob(os.path.join(icondir, '*.png')):
@@ -49,4 +51,5 @@
             22,
             gtk.gdk.pixbuf_new_from_file(filename))
 
+
 _register_icons()

=== modified file 'setup.py'
--- setup.py	2012-02-21 12:27:11 +0000
+++ setup.py	2012-05-04 16:37:18 +0000
@@ -17,7 +17,7 @@
 import sys
 
 from kiwi import kiwi_version
-from kiwi.dist import setup, listfiles, listpackages, get_site_packages_dir
+from kiwi.dist import setup, listfiles, listpackages
 
 
 ext_modules = []

=== modified file 'tests/Proxies/CheckButton.py'
--- tests/Proxies/CheckButton.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/CheckButton.py	2012-05-04 16:37:18 +0000
@@ -10,12 +10,15 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     A = 1
     B = 0
 
+
 class CheckProxy(Proxy):
     widgets = [":B", ":A"]
+
     def __init__(self, model):
         self._build()
         Proxy.__init__(self, model, delete_handler=gtk.mainquit)
@@ -30,6 +33,7 @@
         vbox.add(self.B)
         self.win.add(vbox)
 
+
 class ToggleProxy(CheckProxy):
     def _build(self):
         self.win = gtk.Window()
@@ -48,7 +52,9 @@
 c.B.clicked()
 assert f.A == 0, f.A
 assert f.B == 1, f.B
-if DEBUG: c.show_all_and_loop() ; print f.__dict__
+if DEBUG:
+    c.show_all_and_loop()
+    print f.__dict__
 print "CheckButton OK"
 
 f = Foo()
@@ -59,5 +65,7 @@
 c.B.clicked()
 assert f.A == 0, f.A
 assert f.B == 1, f.B
-if DEBUG: c.show_all_and_loop(); print f.__dict__
+if DEBUG:
+    c.show_all_and_loop()
+    print f.__dict__
 print "ToggleButton OK"

=== modified file 'tests/Proxies/Entry.py'
--- tests/Proxies/Entry.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/Entry.py	2012-05-04 16:37:18 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-import sys, pprint
+import pprint
+import sys
 sys.path.insert(0, "../..")
 
 DEBUG = 0
@@ -12,6 +13,7 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     A = "Alphabet"
     B = "Beetroot"
@@ -22,6 +24,7 @@
     G = 30
     # H unset
 
+
 class NumberFoo(Model):
     A = 1
     B = 2
@@ -32,8 +35,10 @@
     G = 6
     # H unset
 
+
 class EntryProxy(Proxy):
     widgets = [":B", ":A", ":C", ":D", ":E", ":F", ":G", ":H"]
+
     def __init__(self, model, flag=0):
         self._build()
         self.set_numeric("C")
@@ -71,6 +76,7 @@
         self.vbox = vbox
         self.win.add(vbox)
 
+
 class ComboProxy(EntryProxy):
     def _build(self):
         self.win = gtk.Window()
@@ -99,6 +105,7 @@
         vbox.add(self.H)
         self.win.add(vbox)
 
+
 class LabelProxy(EntryProxy):
     def _build(self):
         self.win = gtk.Window()
@@ -122,6 +129,7 @@
         vbox.add(self.H)
         self.win.add(vbox)
 
+
 class SpinProxy(EntryProxy):
     def _build(self):
         self.win = gtk.Window()
@@ -183,7 +191,9 @@
 t = c.G.get_text()
 assert t == "30,420", t
 assert f.G == 30.42
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print "Entry OK"
 
 f = Foo()
@@ -209,7 +219,9 @@
 assert f.D == "barney", f.D
 t = c.G.entry.get_text()
 assert t == "30,420", t
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print "Combo OK"
 
 f = Foo()
@@ -243,7 +255,9 @@
 assert c.D.get() == "barney", f.D
 t = c.G.get_text()
 assert t == "30,420", t
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print "Label OK"
 
 f = NumberFoo()
@@ -254,7 +268,9 @@
     pass
 f.flush_proxies()
 c = SpinProxy(f, 1)
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 assert f.A == 0, f.A
 assert f.B == 0, f.B
 assert f.C == 0

=== modified file 'tests/Proxies/NoModel.py'
--- tests/Proxies/NoModel.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/NoModel.py	2012-05-04 16:37:18 +0000
@@ -4,7 +4,8 @@
 # Tests creating a Proxy with no initial model, and then adding one later
 #
 
-import sys, pprint
+import pprint
+import sys
 sys.path.insert(0, "../..")
 
 DEBUG = 0
@@ -15,11 +16,14 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     pass
 
+
 class XProxy(Proxy):
     widgets = [":A"]
+
     def __init__(self, model=None, flag=0):
         self._build()
         self.set_numeric("A")

=== modified file 'tests/Proxies/None.py'
--- tests/Proxies/None.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/None.py	2012-05-04 16:37:18 +0000
@@ -16,11 +16,14 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     pass
 
+
 class NoProxy(Proxy):
     widgets = [":A"]
+
     def __init__(self, model, flag=0):
         self._build()
         Proxy.__init__(self, model, delete_handler=gtk.mainquit)

=== modified file 'tests/Proxies/OptionMenu.py'
--- tests/Proxies/OptionMenu.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/OptionMenu.py	2012-05-04 16:37:18 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-import sys, pprint
+import pprint
+import sys
 sys.path.insert(0, "../..")
 
 DEBUG = 0
@@ -12,9 +13,11 @@
 #from Kiwi.Menu import OptionMenu
 from gtk import OptionMenu
 
+
 def prefill(args):
     print "ARGS", args
 
+
 class Foo(Model):
     A = "Run"
     B = "Hide"
@@ -23,8 +26,10 @@
     E = 666 # Run
     # No F - Play
 
+
 class CheckProxy(Proxy):
     widgets = [":A", ":B", ":C", ":D", ":E", ":F"]
+
     def __init__(self, model):
         self._build()
         Proxy.__init__(self, model, delete_handler=gtk.mainquit)
@@ -41,9 +46,9 @@
         self.D = OptionMenu()
         self.D.prefill(["Play", "Hide", "Run"])
         self.E = OptionMenu()
-        self.E.prefill([("Play", 111), ("Hide", 222) , ("Run", 666)])
+        self.E.prefill([("Play", 111), ("Hide", 222), ("Run", 666)])
         self.F = OptionMenu()
-        self.F.prefill([("Play", 111), ("Hide", 222) , ("Run", 666)])
+        self.F.prefill([("Play", 111), ("Hide", 222), ("Run", 666)])
         vbox = gtk.VBox()
         vbox.add(self.A)
         vbox.add(self.B)
@@ -73,5 +78,7 @@
 except ValueError:
     # XXX: set value back to normal. See Model.__setattr__
     f.E = 222
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print "OptionMenu OK"

=== modified file 'tests/Proxies/RadioGroup.py'
--- tests/Proxies/RadioGroup.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/RadioGroup.py	2012-05-04 16:37:18 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-import sys, pprint
+import pprint
+import sys
 sys.path.insert(0, "../..")
 
 DEBUG = 0
@@ -10,6 +11,7 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     A = "Play"
     B = 222
@@ -18,6 +20,7 @@
     E = None # Run
     # No F - Play
 
+
 class RadioProxy(Proxy):
     def __init__(self, model):
         self._build()
@@ -99,5 +102,7 @@
 assert f.A == "Run", f.A
 f.E = None
 assert f.E == 111, f.E
-if DEBUG: c.show_all_and_loop(); pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print 'RadioButton OK'

=== modified file 'tests/Proxies/Separator.py'
--- tests/Proxies/Separator.py	2005-06-28 18:34:30 +0000
+++ tests/Proxies/Separator.py	2012-05-04 16:37:18 +0000
@@ -11,11 +11,14 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.Models import Model
 
+
 class Foo(Model):
     A = 10.10
 
+
 class EntryProxy(Proxy):
     widgets = [":A"]
+
     def __init__(self, model):
         self.set_numeric("A")
         self._build()

=== modified file 'tests/Proxies/Text.py'
--- tests/Proxies/Text.py	2006-03-10 19:10:55 +0000
+++ tests/Proxies/Text.py	2012-05-04 16:37:18 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-import sys, pprint
+import pprint
+import sys
 sys.path.insert(0, "../..")
 
 DEBUG = 0
@@ -12,6 +13,7 @@
 from Kiwi.Proxies import Proxy
 from Kiwi.FrameWork import Model
 
+
 class Foo(Model):
     A = "Alphabet"
     B = "Beetroot"
@@ -21,8 +23,10 @@
     # F unset
     G = 30.42
 
+
 class TextProxy(Proxy):
     widgets = [":A", ":B", ":C", ":D", ":E", ":F", ":G"]
+
     def __init__(self, model, flag=0):
         self._build()
         self.set_numeric("C")
@@ -88,5 +92,7 @@
 assert f.D == "barney", f.D
 t = c.G.get_chars(0, c.G.get_length())
 assert t == "30.420", t
-if DEBUG: c.show_all_and_loop() ; pprint.pprint(f.__dict__)
+if DEBUG:
+    c.show_all_and_loop()
+    pprint.pprint(f.__dict__)
 print "Text OK"

=== modified file 'tests/test_BaseView.py'
--- tests/test_BaseView.py	2006-10-05 14:33:18 +0000
+++ tests/test_BaseView.py	2012-05-04 16:37:18 +0000
@@ -10,8 +10,10 @@
                             set_background, get_background
 from kiwi.ui.views import BaseView
 
+
 class FooView(BaseView):
-    widgets = [ "vbox", "label" ]
+    widgets = ["vbox", "label"]
+
     def __init__(self):
         self.build_ui()
         BaseView.__init__(self, toplevel_name='win')
@@ -29,6 +31,7 @@
         self.vbox = vbox
         return vbox
 
+
 class FooController(BaseController):
     def __init__(self, view):
         keyactions = {
@@ -46,6 +49,7 @@
         # This is subclassed
         self.view.label.set_text("Good click!")
 
+
 class Bar(BaseView, BaseController):
     def __init__(self):
         self.win = gtk.Window()
@@ -56,6 +60,7 @@
         set_foreground(self.label, "#CC99FF")
         set_background(self.win, "#001100")
 
+
 # these classes are bad and should trigger exceptions
 
 class NoWinFoo(BaseView, BaseController):
@@ -76,6 +81,7 @@
     def on_noogie__haxored(self, *args):
         print "I AM NOT A NUMBER I AM A FREE MAN"
 
+
 class BaseViewTest(unittest.TestCase):
 
     def setUp(self):

=== modified file 'tests/test_CheckButton.py'
--- tests/test_CheckButton.py	2011-06-24 20:16:58 +0000
+++ tests/test_CheckButton.py	2012-05-04 16:37:18 +0000
@@ -3,6 +3,7 @@
 
 from kiwi.ui.widgets.checkbutton import ProxyCheckButton
 
+
 class CheckButtonTest(unittest.TestCase):
     def testForBool(self):
         myChkBtn = ProxyCheckButton()

=== modified file 'tests/test_ComboBox.py'
--- tests/test_ComboBox.py	2007-01-29 18:20:43 +0000
+++ tests/test_ComboBox.py	2012-05-04 16:37:18 +0000
@@ -5,6 +5,7 @@
 from kiwi.ui.proxy import Proxy
 from kiwi.ui.widgets.combobox import ProxyComboBox, ProxyComboBoxEntry
 
+
 class TestComboBox(unittest.TestCase):
     def setUp(self):
         self.combo = ProxyComboBox()
@@ -74,6 +75,7 @@
         self.combo.clear()
         self.assertEqual(map(list, self.combo.get_model()), [])
 
+
 class FakeView:
     def handler_block(self, widget):
         pass
@@ -81,6 +83,7 @@
     def handler_unblock(self, widget):
         pass
 
+
 class BaseModelTest:
     def setUp(self):
         self.model = Settable(attr=0)
@@ -105,9 +108,11 @@
         self.combo.select_item_by_label('foo')
         self.assertEqual(self.model.attr, 0)
 
+
 class ComboModelTest(BaseModelTest, unittest.TestCase):
     type = ProxyComboBox
 
+
 class ComboEntryModelTest(BaseModelTest, unittest.TestCase):
     type = ProxyComboBoxEntry
 

=== modified file 'tests/test_Delegate.py'
--- tests/test_Delegate.py	2006-09-05 22:52:29 +0000
+++ tests/test_Delegate.py	2012-05-04 16:37:18 +0000
@@ -5,10 +5,12 @@
 from kiwi.ui.delegates import Delegate, GladeDelegate
 from utils import refresh_gui
 
+
 class A:
     def on_foo__clicked(self, *args):
         self.x = "FOO in A"
 
+
 class B:
     def on_foo__clicked(self, *args):
         self.x = "FOO in B"
@@ -16,20 +18,25 @@
     def on_bar__clicked(self, *args):
         self.y = "BAR in B"
 
+
 class C:
     def on_foo__clicked(self, *args):
         self.x = "FOO in C"
 
-class X(A,B,C):
+
+class X(A, B, C):
     def on_foo__clicked(self, *args):
         self.x = "FOO in X"
 
+
 class Y:
     def on_foo__clicked(self, *args):
         self.x = "FOO in Y"
 
-class Foo(X,Y,Delegate):
-    widget  = ["foo"]
+
+class Foo(X, Y, Delegate):
+    widget = ["foo"]
+
     def __init__(self):
         self.win = gtk.Window()
         self.foo = gtk.Button("CLICK ME AND BE HAPPY")
@@ -48,6 +55,7 @@
     def on_bar__clicked(self, *args):
         self.y = "BAR in B"
 
+
 class ClickCounter(Delegate):
     """In this delegate we count the number of clicks we do"""
     def __init__(self):
@@ -62,6 +70,7 @@
     def on_button__clicked(self, *args):
         self.clicks += 1
 
+
 class GladeClickCounter(GladeDelegate):
     def __init__(self):
         GladeDelegate.__init__(self, gladefile="simple_button",
@@ -72,6 +81,7 @@
     def on_button__clicked(self, *args):
         self.clicks += 1
 
+
 class DelegateTest(unittest.TestCase):
     def testButtons(self):
         f = Foo()

=== modified file 'tests/test_Entry.py'
--- tests/test_Entry.py	2008-06-05 21:34:47 +0000
+++ tests/test_Entry.py	2012-05-04 16:37:18 +0000
@@ -10,6 +10,7 @@
 from kiwi.ui.entry import KiwiEntry
 from kiwi.ui.widgets.entry import ProxyEntry
 
+
 class EntryTest(unittest.TestCase):
     def testModel(self):
         entry = ProxyEntry()

=== modified file 'tests/test_Label.py'
--- tests/test_Label.py	2006-03-23 21:15:31 +0000
+++ tests/test_Label.py	2012-05-04 16:37:18 +0000
@@ -3,6 +3,7 @@
 
 from kiwi.ui.widgets.label import ProxyLabel
 
+
 class LabelTest(unittest.TestCase):
     def testAttr(self):
         label = ProxyLabel()

=== modified file 'tests/test_ObjectList.py'
--- tests/test_ObjectList.py	2011-11-23 17:50:39 +0000
+++ tests/test_ObjectList.py	2012-05-04 16:37:18 +0000
@@ -9,6 +9,7 @@
 
 from utils import refresh_gui
 
+
 class Person:
     def __init__(self, name, age):
         self.name, self.age = name, age
@@ -18,6 +19,7 @@
            Person('Kiko', 28), Person('Salgado', 25),
            Person('Lorenzo', 26), Person('Henrique', 21))
 
+
 class ColumnTests(unittest.TestCase):
 
     def setUp(self):
@@ -51,6 +53,7 @@
         column = gobject.new(Column, attribute='foo')
         self.assertEquals(column.attribute, "foo")
 
+
 class DataTests(unittest.TestCase):
     """In all this tests we use the same configuration for a list"""
     def setUp(self):
@@ -132,7 +135,6 @@
 
         self.assertEqual(len(self.list), 0)
 
-
     def testUpdatingOneInstance(self):
         global persons
 
@@ -154,7 +156,6 @@
         new_person = Person('Nando', 32)
         self.assertRaises(ValueError, self.list.update, new_person)
 
-
     def testContains(self):
         global persons
 
@@ -173,6 +174,7 @@
         self.list.remove(first)
         self.assertRaises(ValueError, self.list.select, first)
 
+
 class TreeDataTests(unittest.TestCase):
     def setUp(self):
         self.win = gtk.Window()
@@ -218,6 +220,7 @@
         test_descendants = self.tree.get_descendants(child2)
         self.assertEqual(test_descendants, [])
 
+
 class TestSignals(unittest.TestCase):
     def setUp(self):
         self.klist = ObjectList()
@@ -265,6 +268,7 @@
         self.assertEqual(self.selected, None)
         self.assertRaises(ValueError, self.klist.select, 2)
 
+
 class ConstructorTest(unittest.TestCase):
     def testInvalidArguments(self):
         self.assertRaises(TypeError, ObjectList, columns='')
@@ -287,6 +291,7 @@
         olist = gobject.new(ObjectList)
         self.assertTrue(isinstance(olist, ObjectList))
 
+
 class MethodTest(unittest.TestCase):
     def setUp(self):
         self.klist = ObjectList([Column('name', sorted=True)],
@@ -399,6 +404,7 @@
         self.assertEqual(self.klist[1].name, 'three')
         self.assertEqual(self.klist[2].name, 'one')
 
+
 class BooleanDataTests(unittest.TestCase):
     def setUp(self):
         self.list = ObjectList([Column('value', data_type=bool, radio=True,

=== modified file 'tests/test_Scale.py'
--- tests/test_Scale.py	2008-06-05 21:34:47 +0000
+++ tests/test_Scale.py	2012-05-04 16:37:18 +0000
@@ -3,6 +3,7 @@
 
 from kiwi.ui.widgets.scale import ProxyHScale, ProxyVScale
 
+
 class ScaleTest(unittest.TestCase):
     def testFloat(self):
         vscale = ProxyVScale()

=== modified file 'tests/test_SpinButton.py'
--- tests/test_SpinButton.py	2008-06-05 21:34:47 +0000
+++ tests/test_SpinButton.py	2012-05-04 16:37:18 +0000
@@ -3,6 +3,7 @@
 
 from kiwi.ui.widgets.spinbutton import ProxySpinButton
 
+
 class SpinButtonTest(unittest.TestCase):
     def testForIntFloat(self):
         mySpinBtn = ProxySpinButton()

=== modified file 'tests/test_argcheck.py'
--- tests/test_argcheck.py	2006-06-05 14:34:48 +0000
+++ tests/test_argcheck.py	2012-05-04 16:37:18 +0000
@@ -4,6 +4,7 @@
 from kiwi.argcheck import argcheck, number, percent
 from kiwi.datatypes import Decimal
 
+
 class ArgTest(unittest.TestCase):
     def testOneArg(self):
         f = argcheck(str)(lambda s: None)
@@ -120,7 +121,6 @@
         self.assertRaises(TypeError, func_none2, s='boogie',
                           date=None, date2=True)
 
-
     def testNumber(self):
         def func(n):
             return n
@@ -149,6 +149,7 @@
 
     def testDisable(self):
         argcheck.disable()
+
         def func(s):
             pass
         func = argcheck(str)(func)
@@ -158,7 +159,7 @@
     def testErrorHandling(self):
         self.assertRaises(TypeError, argcheck(str), True)
         self.assertRaises(TypeError, argcheck(int), lambda **x: None)
-        self.assertRaises(TypeError, argcheck(int), lambda : None)
+        self.assertRaises(TypeError, argcheck(int), lambda: None)
         self.assertRaises(TypeError, argcheck(int), lambda x='str': None)
 
 if __name__ == '__main__':

=== modified file 'tests/test_comboentry.py'
--- tests/test_comboentry.py	2006-08-29 18:19:55 +0000
+++ tests/test_comboentry.py	2012-05-04 16:37:18 +0000
@@ -6,6 +6,7 @@
 from kiwi.ui.comboentry import ComboEntry
 from kiwi.ui.widgets.combo import ProxyComboEntry
 
+
 class TestComboEntry(unittest.TestCase):
     def setUp(self):
         self.called = False
@@ -32,6 +33,7 @@
         entry.entry.emit('activate')
         self.assertEqual(self.called, True)
 
+
 class TestProxyComboEntry(unittest.TestCase):
     def testSelectItemByLabel(self):
         entry = ProxyComboEntry()
@@ -101,7 +103,7 @@
         entry = ProxyComboEntry()
         self.assertEqual(entry.get_mode(), ComboMode.UNKNOWN)
         entry.prefill(['one', 'two'])
-        self.assertEqual(entry.get_mode(),  ComboMode.STRING)
+        self.assertEqual(entry.get_mode(), ComboMode.STRING)
 
 if __name__ == '__main__':
     unittest.main()

=== modified file 'tests/test_component.py'
--- tests/test_component.py	2006-10-31 14:46:30 +0000
+++ tests/test_component.py	2012-05-04 16:37:18 +0000
@@ -3,11 +3,12 @@
 from kiwi.component import AlreadyImplementedError, Interface, \
      get_utility, provide_utility, remove_utility, implements, utilities
 
+o = object()
+
+
 class IBanana(Interface):
     pass
 
-class Obj(object): pass
-o = Obj()
 
 class TestUtilities(unittest.TestCase):
     def tearDown(self):
@@ -53,12 +54,12 @@
     def testImplements(self):
         class I1(Interface):
             pass
+
         class C(object):
             implements(I1)
+
         c = C()
-        class X(object):
-            pass
-        x = X()
+        x = object()
         self.assertEqual(I1.providedBy(x), False)
         #self.assertEqual(I1.providedBy(C), False)
         self.assertEqual(I1.providedBy(c), True)
@@ -66,12 +67,16 @@
     def testInterfaceSub(self):
         class I1(Interface):
             pass
+
         class I2(I1):
             pass
+
         class C(object):
             implements(I2)
+
         class D(object):
             implements(I1)
+
         c = C()
         self.assertEqual(I1.providedBy(c), True)
         self.assertEqual(I2.providedBy(c), True)
@@ -87,12 +92,12 @@
 
         class I1(Interface):
             pass
+
         class C(object):
             implements(I1)
+
         c = C()
-        class X(object):
-            pass
-        x = X()
+        x = object()
         self.assertEqual(I1.providedBy(x), False)
         self.assertEqual(I1.providedBy(C), False)
         self.assertEqual(I1.providedBy(c), True)
@@ -105,12 +110,16 @@
 
         class I1(Interface):
             pass
+
         class I2(I1):
             pass
+
         class C(object):
             implements(I2)
+
         class D(object):
             implements(I1)
+
         c = C()
         self.assertEqual(I1.providedBy(c), True)
         self.assertEqual(I2.providedBy(c), True)

=== modified file 'tests/test_datatypes.py'
--- tests/test_datatypes.py	2012-03-12 20:54:34 +0000
+++ tests/test_datatypes.py	2012-05-04 16:37:18 +0000
@@ -2,9 +2,6 @@
 import datetime
 import locale
 import unittest
-import sys
-
-from gtk import gdk
 
 from kiwi.datatypes import converter, ValidationError, ValueUnset, \
      Decimal, BaseConverter
@@ -15,19 +12,23 @@
 from kiwi.ui import proxywidget
 proxywidget # pyflakes
 
+fake = type('fake', (object,), {})
+
+
 def set_locale(category, name):
     # set the date format to the spanish one
     try:
-        rv = locale.setlocale(category, name)
+        locale.setlocale(category, name)
     except locale.Error:
         print 'skipping %s, locale not available' % name
         return False
     return True
 
-fake = type('fake', (object,), {})
+
 class FakeConverter(BaseConverter):
     type = fake
 
+
 class RegistryTest(unittest.TestCase):
     def testAdd(self):
         self.assertRaises(TypeError, converter.add, object)
@@ -53,6 +54,7 @@
         conv = converter.get_converter(object)
         self.assertTrue(conv in converters)
 
+
 class BoolTest(unittest.TestCase):
     def setUp(self):
         self.conv = converter.get_converter(bool)
@@ -70,6 +72,7 @@
         # you are not supposed to pass something that is not a string
         self.assertRaises(AttributeError, self.conv.from_string, None)
 
+
 class DateTest(unittest.TestCase):
     def setUp(self):
         set_locale(locale.LC_TIME, 'C')
@@ -217,6 +220,7 @@
         recoverd_var = cPickle.loads(pickled_var)
         self.assertEqual(recoverd_var.format(), '$12,123.45')
 
+
 class UnicodeTest(unittest.TestCase):
     def setUp(self):
         self.conv = converter.get_converter(unicode)
@@ -230,6 +234,7 @@
         self.assertEqual(self.conv.as_string(u'foobar'), 'foobar')
         self.assertEqual(self.conv.as_string(u'\xe4'), '\xc3\xa4')
 
+
 class IntTest(unittest.TestCase):
     def setUp(self):
         self.conv = converter.get_converter(int)
@@ -251,6 +256,7 @@
 
         self.assertEqual(self.conv.as_string(123456789), '123456789')
 
+
 class FloatTest(unittest.TestCase):
     def setUp(self):
         self.conv = converter.get_converter(float)
@@ -376,6 +382,7 @@
         self.assertEqual(self.conv.as_string(Decimal('10000000.0')),
                          '10 000 000,0')
 
+
 class EnumTest(unittest.TestCase):
     def testSimple(self):
         class status(enum):

=== modified file 'tests/test_dateentry.py'
--- tests/test_dateentry.py	2006-08-03 13:51:40 +0000
+++ tests/test_dateentry.py	2012-05-04 16:37:18 +0000
@@ -3,6 +3,7 @@
 
 from kiwi.ui.dateentry import DateEntry
 
+
 class TestDateEntry(unittest.TestCase):
     def setUp(self):
         self.date = datetime.date.today()

=== modified file 'tests/test_desktopparser.py'
--- tests/test_desktopparser.py	2006-03-27 13:23:13 +0000
+++ tests/test_desktopparser.py	2012-05-04 16:37:18 +0000
@@ -12,6 +12,7 @@
 Categories=GNOME;Application;AudioVideo
 """
 
+
 class TestTotem(unittest.TestCase):
     def setUp(self):
         self.parser = DesktopParser()

=== modified file 'tests/test_log.py'
--- tests/test_log.py	2007-01-29 18:22:25 +0000
+++ tests/test_log.py	2012-05-04 16:37:18 +0000
@@ -7,6 +7,7 @@
 
 from kiwi.log import Logger, set_log_file
 
+
 class LogTest(unittest.TestCase):
     def setUp(self):
         self.filename = tempfile.mktemp()
@@ -26,7 +27,6 @@
         self.assertEqual(len(lines), 1)
         self.failUnless('sliff' in lines[0])
 
-
     def testStdErr(self):
         root = logging.getLogger()
         stream = root.handlers[0]

=== modified file 'tests/test_masks.py'
--- tests/test_masks.py	2010-06-24 20:06:00 +0000
+++ tests/test_masks.py	2012-05-04 16:37:18 +0000
@@ -8,42 +8,44 @@
 from kiwi.ui.entry import KiwiEntry
 
 SPECIAL_KEYS = {
-    '/' : 'slash',
-    '+' : 'plus',
-    '-' : 'minus',
-    '(' : 'parenleft',
-    ')' : 'parenright',
-    ' ' : 'space',
-}
+    '/': 'slash',
+    '+': 'plus',
+    '-': 'minus',
+    '(': 'parenleft',
+    ')': 'parenright',
+    ' ': 'space',
+    }
 
 DELAY = 0.1
 
+
 def send_backspace(widget):
     event = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
     event.keyval = int(keysyms.BackSpace)
     event.hardware_keycode = 22
     event.window = widget.window
-#    widget.event(event)
+    #widget.event(event)
     gtk.main_do_event(event)
     refresh_gui(DELAY)
 
+
 def send_delete(widget):
     event = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
     event.keyval = int(keysyms.Delete)
     event.hardware_keycode = 107
     event.window = widget.window
     gtk.main_do_event(event)
-#    widget.event(event)
+    #widget.event(event)
     refresh_gui(DELAY)
 
 
 def send_key(widget, key):
     if isinstance(key, str) and key.isdigit():
-        key = 'KP_'+key
+        key = 'KP_' + key
     elif isinstance(key, str) and key in SPECIAL_KEYS:
         key = SPECIAL_KEYS[key]
 
-    keysym  = getattr(keysyms, key)
+    keysym = getattr(keysyms, key)
 
     # Key press
     event = gtk.gdk.Event(gtk.gdk.KEY_PRESS)
@@ -53,17 +55,22 @@
 
     refresh_gui(DELAY)
 
+
 def insert_text(widget, text):
     for i in text:
         send_key(widget, i)
 
+
 LEFT, RIGHT = -1, 1
+
+
 def move(entry, direction):
     entry.emit('move-cursor', gtk.MOVEMENT_VISUAL_POSITIONS, direction, False)
 
+
 def select(entry, start, end):
     entry.set_position(start)
-    entry.emit('move-cursor', gtk.MOVEMENT_VISUAL_POSITIONS, end-start, True)
+    entry.emit('move-cursor', gtk.MOVEMENT_VISUAL_POSITIONS, end - start, True)
 
 
 class MasksDelegate(Delegate):
@@ -76,7 +83,6 @@
         self.win.show_all()
 
 
-
 class TestMasks(unittest.TestCase):
     def setUp(self):
         self.delegate = MasksDelegate()
@@ -129,7 +135,6 @@
         insert_text(entry, '1234567890')
         self.assertEqual(entry.get_text(), '(12) 3456-7890')
 
-
     def testMovementTabsEmptyMask(self):
         entry = self.entry
         entry.set_mask('[phone]')
@@ -173,7 +178,6 @@
         move(entry, LEFT)
         self.assertEqual(entry.get_position(), 3)
 
-
         # Home
         entry.emit('move-cursor', gtk.MOVEMENT_DISPLAY_LINE_ENDS, -1, False)
         self.assertEqual(entry.get_position(), 1)
@@ -220,7 +224,6 @@
         insert_text(entry, '4')
         self.assertEqual(entry.get_text(), '(1 ) 2 3 -4   ')
 
-
     # FIXME: Delete/Backspace does not work on windows or xvfb
     def testBackspace(self):
         if 1:
@@ -320,4 +323,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

=== added file 'tests/test_pep8.py'
--- tests/test_pep8.py	1970-01-01 00:00:00 +0000
+++ tests/test_pep8.py	2012-05-04 16:37:18 +0000
@@ -0,0 +1,50 @@
+import unittest
+
+import pep8
+
+from utils import SourceTest
+
+ERRORS = [
+    'E111', # indentation is not a multiple of four
+    'E112', # expected an indented block
+    'E113', # unexpected indentation
+    'E201', # whitespace after '{'
+    'E202', # whitespace before ')'
+    'E203', # whitespace before ':'
+    'E211', # whitespace before '('
+    'E221', # multiple spaces before operator
+    'E225', # missing whitespace around operator
+    'E231', # E231 missing whitespace after ','/':'
+    'E241', # multiple spaces after operator
+    'E251', # no spaces around keyword / parameter equals
+    'E262', # inline comment should start with '# '
+    'W291', # trailing whitespace
+    'W292', # no newline at end of file
+    'W293', # blank line contains whitespace
+    'E301', # expected 1 blank line, found 0
+    'E302', # expected 2 blank lines, found 1
+    'E303', # too many blank lines
+    'W391', # blank line at end of file
+    'E401', # multiple imports on one line
+    'W601', # in instead of dict.has_key
+    'W602', # deprecated form of raising exception
+    'W603', # '<>' is deprecated, use '!='"
+    'W604', # backticks are deprecated, use 'repr()'
+    'E701', # multiple statements on one line (colon)
+    'E702', # multiple statements on one line (semicolon)
+    ]
+
+
+class TestPEP8(SourceTest, unittest.TestCase):
+    """Check for pep8 problems on kiwi sources"""
+
+    def check_filename(self, root, filename):
+        pep8.process_options([
+            '--repeat',
+            '--select=%s' % (','.join(ERRORS), ), filename
+            ])
+        pep8.input_file(filename)
+        result = pep8.get_count()
+        if result:
+            raise AssertionError("ERROR: %d PEP8 errors in %s" % (result,
+                                                                  filename))

=== modified file 'tests/test_proxy.py'
--- tests/test_proxy.py	2012-02-21 12:37:13 +0000
+++ tests/test_proxy.py	2012-05-04 16:37:18 +0000
@@ -1,10 +1,8 @@
-import sys
 import unittest
 
 from gtk import gdk
 
 from kiwi import ValueUnset
-from kiwi.datatypes import converter
 from kiwi.python import Settable
 from kiwi.ui.proxy import Proxy
 from kiwi.ui.widgets.button import ProxyButton
@@ -17,6 +15,7 @@
 from kiwi.ui.widgets.textview import ProxyTextView
 from kiwi.ui.widgets.combo import ProxyComboEntry, ProxyComboBox
 
+
 class FakeView(object):
     def __init__(self):
         self.widgets = []
@@ -37,6 +36,7 @@
     def handler_unblock(self, *args):
         pass
 
+
 class Model(Settable):
     def __init__(self):
         Settable.__init__(self,
@@ -52,6 +52,7 @@
                           combobox='CB1',
                           button='button')
 
+
 class TestProxy(unittest.TestCase):
     def setUp(self):
         self.view = FakeView()
@@ -75,11 +76,11 @@
         self.view.vscale.get_adjustment().upper = 250
 
         self.comboentry = self.view.add('comboentry', str, ProxyComboEntry)
-        self.comboentry.prefill(['CE1','CE2','CE3'])
+        self.comboentry.prefill(['CE1', 'CE2', 'CE3'])
         self.comboentry.show()
 
         self.combobox = self.view.add('combobox', str, ProxyComboBox)
-        self.combobox.prefill(['CB1','CB2','CB3'])
+        self.combobox.prefill(['CB1', 'CB2', 'CB3'])
         self.combobox.show()
 
         self.model = Model()

=== added file 'tests/test_pyflakes.py'
--- tests/test_pyflakes.py	1970-01-01 00:00:00 +0000
+++ tests/test_pyflakes.py	2012-05-04 16:37:18 +0000
@@ -0,0 +1,81 @@
+import _ast
+import compiler
+import sys
+import unittest
+
+import pyflakes
+
+from utils import SourceTest
+
+
+class TestPyflakes(SourceTest, unittest.TestCase):
+    """Check for pyflakes problems on kiwi sources"""
+
+    def setUp(self):
+        self.checker = __import__('pyflakes.checker').checker
+
+    def check_filename(self, root, filename):
+        warnings = []
+        msgs = []
+        result = 0
+        try:
+            fd = file(filename, 'U')
+            try:
+                result = self._check(fd.read(), filename, warnings)
+            finally:
+                fd.close()
+        except IOError, msg:
+            print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
+            result = 1
+
+        warnings.sort(lambda a, b: cmp(a.lineno, b.lineno))
+        for warning in warnings:
+            msg = str(warning).replace(root, '')
+            print msg
+            msgs.append(msg)
+        if result:
+            raise AssertionError("%d warnings:\n%s\n" % (len(msgs),
+                                                         '\n'.join(msgs)))
+
+    # stolen from pyflakes
+    def _check(self, codeString, filename, warnings):
+        try:
+            if pyflakes.__version__ == '0.4.0':
+                compile(codeString, filename, "exec")
+                tree = compiler.parse(codeString)
+            else:
+                tree = compile(codeString,
+                               filename, "exec", _ast.PyCF_ONLY_AST)
+        except (SyntaxError, IndentationError), value:
+            msg = value.args[0]
+
+            (lineno, offset, text) = value.lineno, value.offset, value.text
+
+            # If there's an encoding problem with the file, the text is None.
+            if text is None:
+                # Avoid using msg, since for the only known case, it contains a
+                # bogus message that claims the encoding the file declared was
+                # unknown.
+                print >> sys.stderr, "%s: problem decoding source" % (filename)
+            else:
+                line = text.splitlines()[-1]
+
+                if offset is not None:
+                    offset = offset - (len(text) - len(line))
+
+                print >> sys.stderr, '%s:%d: %s' % (filename, lineno, msg)
+                print >> sys.stderr, line
+
+                if offset is not None:
+                    print >> sys.stderr, " " * offset, "^"
+
+            return 1
+        except UnicodeError, msg:
+            print >> sys.stderr, 'encoding error at %r: %s' % (filename, msg)
+            return 1
+        else:
+            # Okay, it's syntactically valid.  Now parse it into an ast
+            # and check it.
+            w = self.checker.Checker(tree, filename)
+            warnings.extend(w.messages)
+            return len(warnings)

=== modified file 'tests/test_python.py'
--- tests/test_python.py	2007-05-21 19:10:59 +0000
+++ tests/test_python.py	2012-05-04 16:37:18 +0000
@@ -2,6 +2,7 @@
 
 from kiwi.python import AttributeForwarder, slicerange, enum
 
+
 class SliceTest(unittest.TestCase):
     def genlist(self, limit, start, stop=None, step=None):
         if stop == None:
@@ -27,12 +28,15 @@
     def testStartStopStep(self):
         self.assertEqual(self.genlist(10, 0, 10, 2), range(10)[0:10:2])
 
+
 class Status(enum):
     OPEN, CLOSE = range(2)
 
+
 class Color(enum):
     RED, GREEN, BLUE = range(3)
 
+
 class EnumTest(unittest.TestCase):
     def testEnums(self):
         self.failUnless(issubclass(enum, int))

=== modified file 'tests/test_tasklet.py'
--- tests/test_tasklet.py	2007-06-09 14:53:52 +0000
+++ tests/test_tasklet.py	2012-05-04 16:37:18 +0000
@@ -10,8 +10,9 @@
 
 
 class C(gobject.GObject):
-    __gsignals__ = { 'my-signal': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                                   (gobject.TYPE_INT,)) }
+    __gsignals__ = {'my-signal': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+                                  (gobject.TYPE_INT,))}
+
     def do_my_signal(self, arg):
         self.arg = arg
 
@@ -75,7 +76,9 @@
         self.assertEqual(task.return_value, "return-val")
         ## check that elapsed time aproximately 100 ms second, give or take 50 ms
         ## (glib doesn't guarantee precise timing)
-        self.assert_(math.fabs((t2 - t1) - 0.1) < 0.05, "elapsed time was %f, expected 0.1" % ((t2 - t1),))
+        self.assert_(math.fabs((t2 - t1) - 0.1) < 0.05, "elapsed time was %f, expected 0.1" %
+                     ((t2 - t1),))
+
 
 class TestMessages(unittest.TestCase):
     def testPing(self):
@@ -96,6 +99,7 @@
         self.assertEqual(task.state, tasklet.Tasklet.STATE_ZOMBIE)
         self.assertEqual(task.return_value, 123)
 
+
 class TestIO(unittest.TestCase):
     def testPipe(self):
         #
@@ -134,7 +138,7 @@
         write_chan.set_flags(gobject.IO_FLAG_NONBLOCK)
         write_chan.set_encoding(None)
         write_chan.set_buffered(False)
-        writer = tasklet.run(pipe_writer(write_chan, chr(123)))
+        tasklet.run(pipe_writer(write_chan, chr(123)))
 
         mainloop = gobject.MainLoop()
         reader.add_join_callback(lambda task, retval: mainloop.quit())
@@ -143,6 +147,7 @@
         self.assertEqual(reader.state, tasklet.Tasklet.STATE_ZOMBIE)
         self.assertEqual(reader.return_value, chr(123))
 
+
 class TestCallback(unittest.TestCase):
     def testCallback(self):
 

=== modified file 'tests/test_ui.py'
--- tests/test_ui.py	2007-07-16 13:10:22 +0000
+++ tests/test_ui.py	2012-05-04 16:37:18 +0000
@@ -3,13 +3,16 @@
 import sys
 import unittest
 
+
 def setup(self, rootdir):
     self._dir = os.getcwd()
     os.chdir(rootdir)
 
+
 def teardown(self):
     os.chdir(self._dir)
 
+
 def test_filename(rootdir, filename):
     cmd = '%s %s -v %s' % (sys.executable,
                            os.path.join(rootdir, 'bin', 'kiwi-ui-test'),
@@ -20,6 +23,7 @@
     if status != 0:
         raise AssertionError("UI Test %s failed" % filename)
 
+
 def create():
     testdir = os.path.dirname(__file__)
     uidir = os.path.join(testdir, 'ui')
@@ -33,8 +37,6 @@
             continue
         name = 'test_' + filename[:-7]
 
-        full = os.path.join(uidir, filename)
-
         func = lambda self, filename=filename: test_filename(rootdir, filename)
         try:
             func.__name__ = name
@@ -46,4 +48,3 @@
 # Disable UI tests on win32, they do not quite work yet.
 if sys.platform != 'win32':
     TestUI = create()
-

=== modified file 'tests/utils.py'
--- tests/utils.py	2006-06-09 13:49:55 +0000
+++ tests/utils.py	2012-05-04 16:37:18 +0000
@@ -1,3 +1,4 @@
+import fnmatch
 import os
 import sys
 import time
@@ -10,6 +11,7 @@
 
 import gtk
 
+
 def refresh_gui(delay=0):
     while gtk.events_pending():
         gtk.main_iteration_do(block=False)
@@ -21,3 +23,60 @@
 
 from kiwi.environ import environ
 environ.add_resource('glade', dir)
+
+from kiwi.python import ClassInittableObject
+
+import kiwi
+
+
+def _list_recursively(directory, pattern):
+    matches = []
+    for root, dirnames, filenames in os.walk(directory):
+        for filename in fnmatch.filter(filenames, pattern):
+            # skip backup files
+            if (filename.startswith('.#') or
+                filename.endswith('~')):
+                continue
+            matches.append(os.path.join(root, filename))
+
+    return matches
+
+
+def _get_kiwi_sources(root):
+    for dirpath in ['kiwi', 'tests']:
+        path = os.path.join(root, dirpath)
+        for fname in _list_recursively(path, '*.py'):
+            if fname.endswith('__init__.py'):
+                continue
+            yield fname
+
+        for module in ['setup', 'kiwiwidgets']:
+            yield os.path.join(root, module + '.py')
+
+
+class SourceTest(ClassInittableObject):
+    @classmethod
+    def __class_init__(cls, namespace):
+        root = os.path.dirname(os.path.dirname(kiwi.__file__)) + '/'
+        cls.root = root
+        for filename in _get_kiwi_sources(root):
+            testname = filename[len(root):]
+
+            if not cls.filename_filter(testname):
+                continue
+
+            testname = testname[:-3].replace('/', '_')
+            name = 'test_%s' % (testname, )
+            func = lambda s, r=root, f=filename: s.check_filename(r, f)
+            func.__name__ = name
+            setattr(cls, name, func)
+
+    @classmethod
+    def filename_filter(cls, filename):
+        if cls.__name__ == 'SourceTest':
+            return False
+        else:
+            return True
+
+    def check_filename(self, root, filename):
+        pass