[pygobject] Remove all tabs and fix indentation



commit 32cc594ab6dfbd4843f3db5ec8338d31ad5df6c6
Author: Johan Dahlin <johan gnome org>
Date:   Thu Mar 22 10:24:40 2012 -0300

    Remove all tabs and fix indentation
    
    By running the whole source tree via the indent.py script found
    in the Python distribution.

 demos/gtk-demo/demos/Entry/search_entry.py     |    4 +-
 demos/gtk-demo/demos/Icon View/iconviewedit.py |   41 +++----
 demos/gtk-demo/demos/Tree View/liststore.py    |    8 +-
 demos/gtk-demo/demos/appwindow.py              |   18 ++--
 demos/gtk-demo/demos/dialogs.py                |   26 ++--
 demos/gtk-demo/demos/expander.py               |    6 +-
 demos/gtk-demo/demos/images.py                 |    2 +-
 demos/gtk-demo/demos/links.py                  |    2 +-
 demos/gtk-demo/demos/rotatedtext.py            |   20 ++--
 gi/_glib/option.py                             |    2 +-
 gi/_gobject/constants.py                       |    1 -
 gi/importer.py                                 |    1 -
 gi/module.py                                   |   10 +-
 gi/overrides/GLib.py                           |   11 +-
 gi/overrides/Gdk.py                            |   30 +++---
 gi/overrides/Gio.py                            |    4 +-
 gi/overrides/Gtk.py                            |  150 ++++++++++++------------
 gi/overrides/Pango.py                          |    1 -
 gi/overrides/__init__.py                       |   10 +-
 gi/pygtkcompat.py                              |    2 +-
 tests/compathelper.py                          |    2 +-
 tests/runtests.py                              |   19 ++--
 tests/test_everything.py                       |   22 ++--
 tests/test_gdbus.py                            |   11 +-
 tests/test_gi.py                               |   38 +++---
 tests/test_gobject.py                          |    2 +-
 tests/test_interface.py                        |    1 -
 tests/test_option.py                           |    1 -
 tests/test_overrides.py                        |   78 ++++++------
 tests/test_properties.py                       |    2 +-
 tests/test_uris.py                             |    1 -
 31 files changed, 255 insertions(+), 271 deletions(-)
---
diff --git a/demos/gtk-demo/demos/Entry/search_entry.py b/demos/gtk-demo/demos/Entry/search_entry.py
index 5955f8f..7307fc7 100644
--- a/demos/gtk-demo/demos/Entry/search_entry.py
+++ b/demos/gtk-demo/demos/Entry/search_entry.py
@@ -36,7 +36,7 @@ class SearchboxApp:
         self.window = Gtk.Dialog('Search Entry',
                                  buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.NONE))
 
-        self.window.connect('response', lambda x, y: self.window.destroy()) 
+        self.window.connect('response', lambda x, y: self.window.destroy())
         self.window.connect('destroy', Gtk.main_quit)
 
         content_area = self.window.get_content_area()
@@ -134,7 +134,7 @@ class SearchboxApp:
     def start_search(self, button, entry):
         self.show_cancel_button()
         self.search_progress_id = GObject.timeout_add_seconds(1,
-                                                              self.start_search_feedback, 
+                                                              self.start_search_feedback,
                                                               entry)
         self.finish_search_id = GObject.timeout_add_seconds(15,
                                                             self.finish_search,
diff --git a/demos/gtk-demo/demos/Icon View/iconviewedit.py b/demos/gtk-demo/demos/Icon View/iconviewedit.py
index 115d92c..fe5e8e9 100644
--- a/demos/gtk-demo/demos/Icon View/iconviewedit.py	
+++ b/demos/gtk-demo/demos/Icon View/iconviewedit.py	
@@ -51,8 +51,8 @@ class IconviewEditApp:
         renderer = Gtk.CellRendererPixbuf()
         icon_view.pack_start(renderer, True)
         icon_view.set_cell_data_func(renderer,
-					                 self.set_cell_color,
-					                 None)
+                                     self.set_cell_color,
+                                     None)
 
         renderer = Gtk.CellRendererText()
         icon_view.pack_start(renderer, True)
@@ -64,27 +64,22 @@ class IconviewEditApp:
 
         self.window.show_all()
 
-    def set_cell_color (self,
-                        cell_layout,
-	                    cell,
-		                tree_model,
-	                    iter_,
-	                    icon_view):
-
-         # FIXME return single element instead of tuple
-         text = tree_model.get(iter_, self.COL_TEXT)[0]
-         color = Gdk.color_parse(text)
-         pixel = 0
-         if color is not None:
-             pixel = \
-               (color.red   >> 8) << 24 | \
-               (color.green >> 8) << 16 | \
-               (color.blue  >> 8) << 8
-
-         pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, False, 8, 24, 24)
-         pixbuf.fill(pixel)
-
-         cell.props.pixbuf = pixbuf
+    def set_cell_color (self, cell_layout, cell, tree_model, iter_, icon_view):
+
+        # FIXME return single element instead of tuple
+        text = tree_model.get(iter_, self.COL_TEXT)[0]
+        color = Gdk.color_parse(text)
+        pixel = 0
+        if color is not None:
+            pixel = \
+              (color.red   >> 8) << 24 | \
+              (color.green >> 8) << 16 | \
+              (color.blue  >> 8) << 8
+
+        pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, False, 8, 24, 24)
+        pixbuf.fill(pixel)
+
+        cell.props.pixbuf = pixbuf
 
     def edited (self, cell, path_string, text, icon_view):
         model = icon_view.get_model()
diff --git a/demos/gtk-demo/demos/Tree View/liststore.py b/demos/gtk-demo/demos/Tree View/liststore.py
index 3375c02..d0d72e7 100644
--- a/demos/gtk-demo/demos/Tree View/liststore.py	
+++ b/demos/gtk-demo/demos/Tree View/liststore.py	
@@ -87,7 +87,7 @@ class ListStoreApp:
 
         self.window.set_default_size(280, 250)
         self.window.show_all()
-        
+
         self.window.connect('delete-event', self.window_closed)
         self.timeout = GObject.timeout_add (80, self.spinner_timeout)
 
@@ -98,7 +98,7 @@ class ListStoreApp:
     def spinner_timeout(self):
         if self.model is None:
             return False
-            
+
         iter_ = self.model.get_iter_first()
         pulse = self.model.get(iter_, self.COLUMN_PULSE)[0]
         if pulse == 999999999:
@@ -120,7 +120,7 @@ class ListStoreApp:
                                    str,
                                    bool,
                                    bool)
-        
+
         col = 0
         for bug in data:
             if col == 1 or col == 3:
@@ -144,7 +144,7 @@ class ListStoreApp:
 
     def add_columns(self, treeview):
         model = treeview.get_model()
-        
+
         # column for is_fixed toggle
         renderer = Gtk.CellRendererToggle()
         renderer.connect('toggled', self.is_fixed_toggled, model)
diff --git a/demos/gtk-demo/demos/appwindow.py b/demos/gtk-demo/demos/appwindow.py
index 2c3402f..71ebd9c 100644
--- a/demos/gtk-demo/demos/appwindow.py
+++ b/demos/gtk-demo/demos/appwindow.py
@@ -120,15 +120,15 @@ Boston, MA 02111-1307, USA.
 
     about = Gtk.AboutDialog(parent=window,
                 program_name='GTK+ Code Demos',
-			    version='0.1',
-			    copyright='(C) 2010 The PyGI Team',
-			    license=license,
-			    website='http://live.gnome.org/PyGI',
-			    comments='Program to demonstrate PyGI functions.',
-			    authors=authors,
-			    documenters=documentors,
-			    logo=transparent,
-			    title='About GTK+ Code Demos')
+                            version='0.1',
+                            copyright='(C) 2010 The PyGI Team',
+                            license=license,
+                            website='http://live.gnome.org/PyGI',
+                            comments='Program to demonstrate PyGI functions.',
+                            authors=authors,
+                            documenters=documentors,
+                            logo=transparent,
+                            title='About GTK+ Code Demos')
 
     about.connect('response', widget_destroy)
     about.show()
diff --git a/demos/gtk-demo/demos/dialogs.py b/demos/gtk-demo/demos/dialogs.py
index 4539ff9..6a09492 100644
--- a/demos/gtk-demo/demos/dialogs.py
+++ b/demos/gtk-demo/demos/dialogs.py
@@ -45,11 +45,11 @@ class DialogsApp:
         hbox = Gtk.HBox(spacing=8);
         vbox.pack_start(hbox, False, False, 0)
         button = Gtk.Button.new_with_mnemonic("_Message Dialog");
-     
+
         button.connect('clicked',
-		               self._message_dialog_clicked)
+                       self._message_dialog_clicked)
         hbox.pack_start(button, False, False, 0)
-        
+
         vbox.pack_start(Gtk.HSeparator(),
                         False, False, 0);
 
@@ -58,9 +58,9 @@ class DialogsApp:
         vbox.pack_start(hbox, False, False, 0)
         vbox2 = Gtk.VBox(spacing=0);
         button = Gtk.Button.new_with_mnemonic("_Interactive Dialog");
-     
+
         button.connect('clicked',
-		               self._interactive_dialog_clicked)
+                       self._interactive_dialog_clicked)
         hbox.pack_start(vbox2, False, False, 0)
         vbox2.pack_start(button, False, False, 0)
 
@@ -77,7 +77,7 @@ class DialogsApp:
         label.set_mnemonic_widget (self.entry1)
 
         label = Gtk.Label.new_with_mnemonic("E_ntry 2");
-      
+
         table.attach_defaults(label, 0, 1, 1, 2);
 
         self.entry2 = Gtk.Entry()
@@ -89,10 +89,10 @@ class DialogsApp:
     def _interactive_dialog_clicked(self, button):
         dialog = Gtk.Dialog('Interactive Dialog',
                             self.window,
-				            Gtk.DialogFlags.MODAL | 
+                            Gtk.DialogFlags.MODAL |
                             Gtk.DialogFlags.DESTROY_WITH_PARENT,
-				            (Gtk.STOCK_OK, Gtk.ResponseType.OK,
-                             "_Non-stock Button", Gtk.ResponseType.CANCEL))
+                            (Gtk.STOCK_OK, Gtk.ResponseType.OK,
+                            "_Non-stock Button", Gtk.ResponseType.CANCEL))
 
         content_area = dialog.get_content_area ()
         hbox = Gtk.HBox(spacing=8)
@@ -122,7 +122,7 @@ class DialogsApp:
         local_entry2.set_text (self.entry2.get_text())
         table.attach_defaults(local_entry2, 1, 2, 1, 2)
         label.set_mnemonic_widget(local_entry2);
-  
+
         hbox.show_all();
 
         response = dialog.run()
@@ -134,10 +134,10 @@ class DialogsApp:
 
     def _message_dialog_clicked(self, button):
         dialog = Gtk.MessageDialog(self.window,
-				                   Gtk.DialogFlags.MODAL | 
+                                   Gtk.DialogFlags.MODAL |
                                    Gtk.DialogFlags.DESTROY_WITH_PARENT,
-				                   Gtk.MessageType.INFO,
-				                   Gtk.ButtonsType.OK,
+                                   Gtk.MessageType.INFO,
+                                   Gtk.ButtonsType.OK,
                                    "This message box has been popped up the following\nnumber of times:")
         dialog.format_secondary_text ('%d' % self.dialog_counter)
         dialog.run()
diff --git a/demos/gtk-demo/demos/expander.py b/demos/gtk-demo/demos/expander.py
index 22c0440..8ee9e2a 100644
--- a/demos/gtk-demo/demos/expander.py
+++ b/demos/gtk-demo/demos/expander.py
@@ -21,7 +21,7 @@
 
 title = "Expander"
 description = """
-GtkExpander allows to provide additional content that is initially hidden. 
+GtkExpander allows to provide additional content that is initially hidden.
 This is also known as "disclosure triangle".
 """
 
@@ -29,7 +29,7 @@ from gi.repository import Gtk
 
 class ExpanderApp:
     def __init__(self):
-        self.window = Gtk.Dialog("GtkExpander", 
+        self.window = Gtk.Dialog("GtkExpander",
                                  None, 0,
                                  (Gtk.STOCK_CLOSE, Gtk.ResponseType.NONE))
         self.window.set_resizable(False)
@@ -49,7 +49,7 @@ class ExpanderApp:
 
         label = Gtk.Label('Details can be shown or hidden')
         expander.add(label)
-        
+
         self.window.show_all()
 
 def main(demoapp=None):
diff --git a/demos/gtk-demo/demos/images.py b/demos/gtk-demo/demos/images.py
index 6e72545..a81245a 100644
--- a/demos/gtk-demo/demos/images.py
+++ b/demos/gtk-demo/demos/images.py
@@ -199,7 +199,7 @@ class ImagesApp:
                 # file was truncated we'll know on close that
                 # it was incomplete.
                 try:
-                   self.pixbuf_loader.close()
+                    self.pixbuf_loader.close()
                 except GObject.GError as e:
                     dialog = Gtk.MessageDialog(self.window,
                                                Gtk.DialogFlags.DESTROY_WITH_PARENT,
diff --git a/demos/gtk-demo/demos/links.py b/demos/gtk-demo/demos/links.py
index 1ea57b5..597f5e8 100644
--- a/demos/gtk-demo/demos/links.py
+++ b/demos/gtk-demo/demos/links.py
@@ -21,7 +21,7 @@
 
 title = "Links"
 description = """
-GtkLabel can show hyperlinks. The default action is to call gtk_show_uri() on 
+GtkLabel can show hyperlinks. The default action is to call gtk_show_uri() on
 their URI, but it is possible to override this with a custom handler.
 """
 
diff --git a/demos/gtk-demo/demos/rotatedtext.py b/demos/gtk-demo/demos/rotatedtext.py
index 19388f7..2a1b332 100644
--- a/demos/gtk-demo/demos/rotatedtext.py
+++ b/demos/gtk-demo/demos/rotatedtext.py
@@ -48,13 +48,13 @@ class RotatedTextApp:
     FONT = "Serif 18"
 
     def __init__(self):
-    
+
         white = Gdk.RGBA()
         white.red = 1.0
         white.green = 1.0
         white.blue = 1.0
         white.alpha = 1.0
-        
+
         self.window = Gtk.Window(title="Rotated Text")
         self.window.set_default_size(4 * self.RADIUS, 2 * self.RADIUS)
         self.window.connect('destroy', Gtk.main_quit)
@@ -62,7 +62,7 @@ class RotatedTextApp:
         box = Gtk.HBox()
         box.set_homogeneous(True)
         self.window.add(box)
-        
+
         # add a drawing area
         da = Gtk.DrawingArea()
         box.add(da)
@@ -78,7 +78,7 @@ class RotatedTextApp:
 
         # Setup some fancy stuff on the label
         layout = label.get_layout()
-        
+
         PangoCairo.context_set_shape_renderer(layout.get_context(),
                                               self.fancy_shape_renderer,
                                               None)
@@ -110,7 +110,7 @@ class RotatedTextApp:
         metrics = pango_ctx.get_metrics(layout.get_font_description(),
                                         None)
         ascent = metrics.get_ascent()
-        
+
         logical_rect = Pango.Rectangle()
         logical_rect.x = 0
         logical_rect.width = ascent
@@ -137,7 +137,7 @@ class RotatedTextApp:
         attrs.insert(attr)
         '''
         return attrs
-        
+
     def rotated_text_draw (self, da, cairo_ctx):
         # Create a cairo context and set up a transformation matrix so that the user
         # space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
@@ -149,11 +149,11 @@ class RotatedTextApp:
         cairo_ctx.translate(
                    device_radius + (width - 2 * device_radius) / 2,
                    device_radius + (height - 2 * device_radius) / 2)
-        cairo_ctx.scale(device_radius / self.RADIUS, 
+        cairo_ctx.scale(device_radius / self.RADIUS,
                         device_radius / self.RADIUS)
 
         # Create a subtle gradient source and use it.
-        pattern = cairo.LinearGradient(-self.RADIUS, -self.RADIUS, 
+        pattern = cairo.LinearGradient(-self.RADIUS, -self.RADIUS,
                                         self.RADIUS,  self.RADIUS)
         pattern.add_color_stop_rgb(0.0, 0.5, 0.0, 0.0)
         pattern.add_color_stop_rgb(1.0, 0.0, 0.0, 0.5)
@@ -178,14 +178,14 @@ class RotatedTextApp:
         for i in range(self.N_WORDS):
             # Inform Pango to re-layout the text with the new transformation matrix
             PangoCairo.update_layout(cairo_ctx, layout)
-    
+
             width, height = layout.get_pixel_size()
             cairo_ctx.move_to(-width / 2, -self.RADIUS * 0.9)
             PangoCairo.show_layout(cairo_ctx, layout)
 
             # Rotate for the next turn
             cairo_ctx.rotate(math.pi*2 / self.N_WORDS)
-  
+
         return False
 
 def main(demoapp=None):
diff --git a/gi/_glib/option.py b/gi/_glib/option.py
index af718fb..c41ad8e 100644
--- a/gi/_glib/option.py
+++ b/gi/_glib/option.py
@@ -207,7 +207,7 @@ class OptionGroup(optparse.OptionGroup):
         entries = []
         for option in self.option_list:
             entries.extend(option._to_goptionentries())
- 
+
         group.add_entries(entries)
 
         return group
diff --git a/gi/_gobject/constants.py b/gi/_gobject/constants.py
index ded3513..9daaece 100644
--- a/gi/_gobject/constants.py
+++ b/gi/_gobject/constants.py
@@ -77,4 +77,3 @@ G_MAXSIZE = _gobject.G_MAXSIZE
 G_MAXSSIZE = _gobject.G_MAXSSIZE
 G_MINOFFSET = _gobject.G_MINOFFSET
 G_MAXOFFSET = _gobject.G_MAXOFFSET
-
diff --git a/gi/importer.py b/gi/importer.py
index 8065136..d83a384 100644
--- a/gi/importer.py
+++ b/gi/importer.py
@@ -76,4 +76,3 @@ class DynamicImporter(object):
         dynamic_module._load()
 
         return dynamic_module
-
diff --git a/gi/module.py b/gi/module.py
index 4ee9b80..29b9002 100644
--- a/gi/module.py
+++ b/gi/module.py
@@ -128,7 +128,7 @@ class IntrospectionModule(object):
                 # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
                 # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
                 ascii_upper_trans = maketrans(
-                        'abcdefgjhijklmnopqrstuvwxyz', 
+                        'abcdefgjhijklmnopqrstuvwxyz',
                         'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
                 for value_info in info.get_values():
                     value_name = value_info.get_name().translate(ascii_upper_trans)
@@ -231,9 +231,9 @@ class DynamicModule(object):
                 return getattr(self._overrides_module, name, None)
         else:
             # check the registry just in case the module hasn't loaded yet
-            # TODO: Only gtypes are registered in the registry right now 
-            #       but it would be nice to register all overrides and 
-            #       get rid of the module imports. We might actually see a 
+            # TODO: Only gtypes are registered in the registry right now
+            #       but it would be nice to register all overrides and
+            #       get rid of the module imports. We might actually see a
             #       speedup.
             key = '%s.%s' % (self._namespace, name)
             if key in registry:
@@ -245,7 +245,7 @@ class DynamicModule(object):
         # Python's default dir() is just dir(self.__class__) + self.__dict__.keys()
         result = set(dir(self.__class__))
         result.update(self.__dict__.keys())
-        
+
         result.update(dir(self._introspection_module))
         override_exports = getattr(self._overrides_module, '__all__', ())
         result.update(override_exports)
diff --git a/gi/overrides/GLib.py b/gi/overrides/GLib.py
index 27fe017..b6e0b09 100644
--- a/gi/overrides/GLib.py
+++ b/gi/overrides/GLib.py
@@ -156,11 +156,11 @@ class Variant(GLib.Variant):
 
         format_string is a standard GVariant type signature, value is a Python
         object whose structure has to match the signature.
-        
+
         Examples:
           GLib.Variant('i', 1)
           GLib.Variant('(is)', (1, 'hello'))
-          GLib.Variant('(asa{sv})', ([], {'foo': GLib.Variant('b', True), 
+          GLib.Variant('(asa{sv})', ([], {'foo': GLib.Variant('b', True),
                                           'bar': GLib.Variant('i', 2)}))
         '''
         creator = _VariantCreator()
@@ -216,7 +216,7 @@ class Variant(GLib.Variant):
 
         # tuple
         if self.get_type_string().startswith('('):
-            res = [self.get_child_value(i).unpack() 
+            res = [self.get_child_value(i).unpack()
                     for i in range(self.n_children())]
             return tuple(res)
 
@@ -230,7 +230,7 @@ class Variant(GLib.Variant):
 
         # array
         if self.get_type_string().startswith('a'):
-            return [self.get_child_value(i).unpack() 
+            return [self.get_child_value(i).unpack()
                     for i in range(self.n_children())]
 
         # variant (just unbox transparently)
@@ -245,7 +245,7 @@ class Variant(GLib.Variant):
 
         If the signature is not a tuple, it returns one element with the entire
         signature. If the signature is an empty tuple, the result is [].
-        
+
         This is useful for e. g. iterating over method parameters which are
         passed as a single Variant.
         '''
@@ -377,4 +377,3 @@ setattr(Variant, 'new_tuple', new_tuple)
 setattr(Variant, 'get_string', get_string)
 
 __all__.append('Variant')
-
diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py
index c48a242..8761ae8 100644
--- a/gi/overrides/Gdk.py
+++ b/gi/overrides/Gdk.py
@@ -296,49 +296,49 @@ def color_parse(color):
 if Gdk._version >= '3.0':
     SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True)
     __all__.append('SELECTION_PRIMARY')
-    
+
     SELECTION_SECONDARY = Gdk.atom_intern('SECONDARY', True)
     __all__.append('SELECTION_SECONDARY')
-    
+
     SELECTION_CLIPBOARD = Gdk.atom_intern('CLIPBOARD', True)
     __all__.append('SELECTION_CLIPBOARD')
-    
+
     TARGET_BITMAP = Gdk.atom_intern('BITMAP', True)
     __all__.append('TARGET_BITMAP')
-    
+
     TARGET_COLORMAP = Gdk.atom_intern('COLORMAP', True)
     __all__.append('TARGET_COLORMAP')
-    
+
     TARGET_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
     __all__.append('TARGET_DRAWABLE')
-    
+
     TARGET_PIXMAP = Gdk.atom_intern('PIXMAP', True)
     __all__.append('TARGET_PIXMAP')
-    
+
     TARGET_STRING = Gdk.atom_intern('STRING', True)
     __all__.append('TARGET_STRING')
-    
+
     SELECTION_TYPE_ATOM = Gdk.atom_intern('ATOM', True)
     __all__.append('SELECTION_TYPE_ATOM')
-    
+
     SELECTION_TYPE_BITMAP = Gdk.atom_intern('BITMAP', True)
     __all__.append('SELECTION_TYPE_BITMAP')
-    
+
     SELECTION_TYPE_COLORMAP = Gdk.atom_intern('COLORMAP', True)
     __all__.append('SELECTION_TYPE_COLORMAP')
-    
+
     SELECTION_TYPE_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
     __all__.append('SELECTION_TYPE_DRAWABLE')
-    
+
     SELECTION_TYPE_INTEGER = Gdk.atom_intern('INTEGER', True)
     __all__.append('SELECTION_TYPE_INTEGER')
-    
+
     SELECTION_TYPE_PIXMAP = Gdk.atom_intern('PIXMAP', True)
     __all__.append('SELECTION_TYPE_PIXMAP')
-    
+
     SELECTION_TYPE_WINDOW = Gdk.atom_intern('WINDOW', True)
     __all__.append('SELECTION_TYPE_WINDOW')
-    
+
     SELECTION_TYPE_STRING = Gdk.atom_intern('STRING', True)
     __all__.append('SELECTION_TYPE_STRING')
 
diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py
index 20adf0c..3b556da 100644
--- a/gi/overrides/Gio.py
+++ b/gi/overrides/Gio.py
@@ -165,7 +165,7 @@ class _DBusProxyMethodCall:
 
 class DBusProxy(Gio.DBusProxy):
     '''Provide comfortable and pythonic method calls.
-    
+
     This marshalls the method arguments into a GVariant, invokes the
     call_sync() method on the DBusProxy object, and unmarshalls the result
     GVariant back into a Python tuple.
@@ -193,7 +193,7 @@ class DBusProxy(Gio.DBusProxy):
       error_handler(proxy_object, exception, user_data) is called when it
       finishes. If error_handler is not given, result_handler is called with
       the exception object as result instead.
-    
+
     - user_data: Optional user data to pass to result_handler for
       asynchronous calls.
 
diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
index 1909ca5..4b9f705 100644
--- a/gi/overrides/Gtk.py
+++ b/gi/overrides/Gtk.py
@@ -822,89 +822,89 @@ class TreeModel(Gtk.TreeModel):
         for column in columns:
             value = row[column]
             if value is None:
-               continue  # None means skip this row
+                continue  # None means skip this row
 
             self.set_value(treeiter, column, value)
 
     def _convert_value(self, column, value):
-            if value is None:
-                return None
-
-            # we may need to convert to a basic type
-            type_ = self.get_column_type(column)
-            if type_ == GObject.TYPE_STRING:
-                if isinstance(value, str):
-                    value = str(value)
-                elif sys.version_info < (3, 0):
-                    if isinstance(value, unicode):
-                        value = value.encode('UTF-8')
-                    else:
-                        raise ValueError('Expected string or unicode for column %i but got %s%s' % (column, value, type(value)))
-                else:
-                    raise ValueError('Expected a string for column %i but got %s' % (column, type(value)))
-            elif type_ == GObject.TYPE_FLOAT or type_ == GObject.TYPE_DOUBLE:
-                if isinstance(value, float):
-                    value = float(value)
+        if value is None:
+            return None
+
+        # we may need to convert to a basic type
+        type_ = self.get_column_type(column)
+        if type_ == GObject.TYPE_STRING:
+            if isinstance(value, str):
+                value = str(value)
+            elif sys.version_info < (3, 0):
+                if isinstance(value, unicode):
+                    value = value.encode('UTF-8')
                 else:
-                    raise ValueError('Expected a float for column %i but got %s' % (column, type(value)))
-            elif type_ == GObject.TYPE_LONG or type_ == GObject.TYPE_INT:
-                if isinstance(value, int):
-                    value = int(value)
-                elif sys.version_info < (3, 0):
-                    if isinstance(value, long):
-                        value = long(value)
-                    else:
-                        raise ValueError('Expected an long for column %i but got %s' % (column, type(value)))
+                    raise ValueError('Expected string or unicode for column %i but got %s%s' % (column, value, type(value)))
+            else:
+                raise ValueError('Expected a string for column %i but got %s' % (column, type(value)))
+        elif type_ == GObject.TYPE_FLOAT or type_ == GObject.TYPE_DOUBLE:
+            if isinstance(value, float):
+                value = float(value)
+            else:
+                raise ValueError('Expected a float for column %i but got %s' % (column, type(value)))
+        elif type_ == GObject.TYPE_LONG or type_ == GObject.TYPE_INT:
+            if isinstance(value, int):
+                value = int(value)
+            elif sys.version_info < (3, 0):
+                if isinstance(value, long):
+                    value = long(value)
                 else:
-                    raise ValueError('Expected an integer for column %i but got %s' % (column, type(value)))
-            elif type_ == GObject.TYPE_BOOLEAN:
-                cmp_classes = [int]
+                    raise ValueError('Expected an long for column %i but got %s' % (column, type(value)))
+            else:
+                raise ValueError('Expected an integer for column %i but got %s' % (column, type(value)))
+        elif type_ == GObject.TYPE_BOOLEAN:
+            cmp_classes = [int]
+            if sys.version_info < (3, 0):
+                cmp_classes.append(long)
+
+            if isinstance(value, tuple(cmp_classes)):
+                value = bool(value)
+            else:
+                raise ValueError('Expected a bool for column %i but got %s' % (column, type(value)))
+        else:
+            # use GValues directly to marshal to the correct type
+            # standard object checks should take care of validation
+            # so we don't have to do it here
+            value_container = GObject.Value()
+            value_container.init(type_)
+            if type_ == GObject.TYPE_CHAR:
+                value_container.set_char(value)
+                value = value_container
+            elif type_ == GObject.TYPE_UCHAR:
+                value_container.set_uchar(value)
+                value = value_container
+            elif type_ == GObject.TYPE_UNICHAR:
+                cmp_classes = [str]
                 if sys.version_info < (3, 0):
-                    cmp_classes.append(long)
+                    cmp_classes.append(unicode)
 
                 if isinstance(value, tuple(cmp_classes)):
-                    value = bool(value)
-                else:
-                    raise ValueError('Expected a bool for column %i but got %s' % (column, type(value)))
-            else:
-                # use GValues directly to marshal to the correct type
-                # standard object checks should take care of validation
-                # so we don't have to do it here
-                value_container = GObject.Value()
-                value_container.init(type_)
-                if type_ == GObject.TYPE_CHAR:
-                    value_container.set_char(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_UCHAR:
-                    value_container.set_uchar(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_UNICHAR:
-                    cmp_classes = [str]
-                    if sys.version_info < (3, 0):
-                        cmp_classes.append(unicode)
-
-                    if isinstance(value, tuple(cmp_classes)):
-                        value = ord(value[0])
-
-                    value_container.set_uint(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_UINT:
-                    value_container.set_uint(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_ULONG:
-                    value_container.set_ulong(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_INT64:
-                    value_container.set_int64(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_UINT64:
-                    value_container.set_uint64(value)
-                    value = value_container
-                elif type_ == GObject.TYPE_PYOBJECT:
-                    value_container.set_boxed(value)
-                    value = value_container
-
-            return value
+                    value = ord(value[0])
+
+                value_container.set_uint(value)
+                value = value_container
+            elif type_ == GObject.TYPE_UINT:
+                value_container.set_uint(value)
+                value = value_container
+            elif type_ == GObject.TYPE_ULONG:
+                value_container.set_ulong(value)
+                value = value_container
+            elif type_ == GObject.TYPE_INT64:
+                value_container.set_int64(value)
+                value = value_container
+            elif type_ == GObject.TYPE_UINT64:
+                value_container.set_uint64(value)
+                value = value_container
+            elif type_ == GObject.TYPE_PYOBJECT:
+                value_container.set_boxed(value)
+                value = value_container
+
+        return value
 
     def get(self, treeiter, *columns):
         n_columns = self.get_n_columns()
@@ -1410,7 +1410,7 @@ class Table(Gtk.Table, Container):
 
         if 'n_columns' in kwds:
             columns = kwds.pop('n_columns')
-            
+
         Gtk.Table.__init__(self, n_rows=rows, n_columns=columns, homogeneous=homogeneous, **kwds)
 
     def attach(self, child, left_attach, right_attach, top_attach, bottom_attach, xoptions=Gtk.AttachOptions.EXPAND|Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.EXPAND|Gtk.AttachOptions.FILL, xpadding=0, ypadding=0):
diff --git a/gi/overrides/Pango.py b/gi/overrides/Pango.py
index b8865f2..7030a76 100644
--- a/gi/overrides/Pango.py
+++ b/gi/overrides/Pango.py
@@ -60,4 +60,3 @@ class Layout(Pango.Layout):
 
 Layout = override(Layout)
 __all__.append('Layout')
-
diff --git a/gi/overrides/__init__.py b/gi/overrides/__init__.py
index 513ad31..def9d04 100644
--- a/gi/overrides/__init__.py
+++ b/gi/overrides/__init__.py
@@ -5,14 +5,14 @@ from gi import _gobject
 registry = None
 class _Registry(dict):
     def __setitem__(self, key, value):
-        '''We do checks here to make sure only submodules of the override 
+        '''We do checks here to make sure only submodules of the override
         module are added.  Key and value should be the same object and come
-        from the gi.override module.  
+        from the gi.override module.
 
         We add the override to the dict as "override_module.name".  For instance
         if we were overriding Gtk.Button you would retrive it as such:
         registry['Gtk.Button']
-        ''' 
+        '''
         if not key == value:
             raise KeyError('You have tried to modify the registry.  This should only be done by the override decorator')
 
@@ -26,7 +26,7 @@ class _Registry(dict):
         g_type = info.get_g_type()
         assert g_type != _gobject.TYPE_NONE
         if g_type != _gobject.TYPE_INVALID:
-            g_type.pytype = value 
+            g_type.pytype = value
 
             # strip gi.overrides from module name
             module =  value.__module__[13:]
@@ -61,5 +61,3 @@ def override(type_):
     else:
         registry.register(type_)
         return type_
-
-
diff --git a/gi/pygtkcompat.py b/gi/pygtkcompat.py
index f96b864..eca493c 100644
--- a/gi/pygtkcompat.py
+++ b/gi/pygtkcompat.py
@@ -36,7 +36,7 @@ import sys
 import warnings
 
 try:
-    # Python 3 
+    # Python 3
     from collections import UserList
     from imp import reload
     UserList  # pyflakes
diff --git a/tests/compathelper.py b/tests/compathelper.py
index 2465747..668e60a 100644
--- a/tests/compathelper.py
+++ b/tests/compathelper.py
@@ -49,7 +49,7 @@ if sys.version_info >= (3, 0):
     for tests that need to write to intefaces that take unicode in
     python 2
 
-    python 3 strings are unicode encoded as UTF-8 so the unicode object 
+    python 3 strings are unicode encoded as UTF-8 so the unicode object
     doesn't exist
 
     python 2 differs between a string an unicode string and you must specify
diff --git a/tests/runtests.py b/tests/runtests.py
index 28d5909..af04851 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -19,24 +19,24 @@ os.environ['G_DEBUG'] = 'fatal-warnings fatal-criticals'
 # before importing Gio. Support a separate build tree, so look in build dir
 # first.
 os.environ['GSETTINGS_BACKEND'] = 'memory'
-os.environ['GSETTINGS_SCHEMA_DIR'] = os.environ.get('TESTS_BUILDDIR', 
+os.environ['GSETTINGS_SCHEMA_DIR'] = os.environ.get('TESTS_BUILDDIR',
         os.path.dirname(__file__))
 
 # Load tests.
 if 'TEST_NAMES' in os.environ:
-	names = os.environ['TEST_NAMES'].split()
+    names = os.environ['TEST_NAMES'].split()
 elif 'TEST_FILES' in os.environ:
-	names = []
-	for filename in os.environ['TEST_FILES'].split():
-		names.append(filename[:-3])
+    names = []
+    for filename in os.environ['TEST_FILES'].split():
+        names.append(filename[:-3])
 elif len(sys.argv) > 1:
     names = []
     for filename in sys.argv[1:]:
         names.append(filename.replace('.py', ''))
 else:
-	names = []
-	for filename in glob.iglob("test_*.py"):
-		names.append(filename[:-3])
+    names = []
+    for filename in glob.iglob("test_*.py"):
+        names.append(filename[:-3])
 
 loader = unittest.TestLoader()
 suite = loader.loadTestsFromNames(names)
@@ -46,5 +46,4 @@ suite = loader.loadTestsFromNames(names)
 runner = unittest.TextTestRunner(verbosity=2)
 result = runner.run(suite)
 if not result.wasSuccessful():
-	sys.exit(1) # exit code so "make check" reports error
-
+    sys.exit(1) # exit code so "make check" reports error
diff --git a/tests/test_everything.py b/tests/test_everything.py
index 3bf748b..2b71ef0 100644
--- a/tests/test_everything.py
+++ b/tests/test_everything.py
@@ -66,7 +66,7 @@ class TestEverything(unittest.TestCase):
         self.assertEquals(UNICHAR, Everything.test_unichar(UNICHAR))
         self.assertRaises(TypeError, Everything.test_unichar, "")
         self.assertRaises(TypeError, Everything.test_unichar, "morethanonechar")
-        
+
 
     def test_floating(self):
         e = Everything.TestFloating()
@@ -140,22 +140,22 @@ class TestEverything(unittest.TestCase):
         gtype = Everything.test_gtype(ARegisteredClass)
         self.assertEquals(ARegisteredClass.__gtype__, gtype)
         self.assertRaises(TypeError, Everything.test_gtype, 'ARegisteredClass')
-        
+
     def test_dir(self):
         attr_list = dir(Everything)
-        
+
         # test that typelib attributes are listed
         self.assertTrue('TestStructA' in attr_list)
-        
+
         # test that class attributes and methods are listed
         self.assertTrue('__class__' in attr_list)
         self.assertTrue('__dir__' in attr_list)
         self.assertTrue('__repr__' in attr_list)
-        
+
         # test that instance members are listed
         self.assertTrue('_namespace' in attr_list)
         self.assertTrue('_version' in attr_list)
-        
+
         # test that there are no duplicates returned
         self.assertEqual(len(attr_list), len(set(attr_list)))
 
@@ -235,7 +235,7 @@ class TestCallbacks(unittest.TestCase):
         TestCallbacks.called = False
         def callback():
             TestCallbacks.called = True
-        
+
         Everything.test_simple_callback(callback)
         self.assertTrue(TestCallbacks.called)
 
@@ -280,7 +280,7 @@ class TestCallbacks(unittest.TestCase):
 
         self.assertEquals(Everything.test_callback(callback), 44)
         self.assertTrue(TestCallbacks.called)
-    
+
     def test_callback_async(self):
         TestCallbacks.called = False
         def callback(foo):
@@ -307,11 +307,11 @@ class TestCallbacks(unittest.TestCase):
             self.assertEquals(userdata, "Test%d" % TestCallbacks.called)
             TestCallbacks.called += 1
             return TestCallbacks.called
-        
+
         for i in range(100):
             val = Everything.test_callback_user_data(callback, "Test%d" % i)
             self.assertEquals(val, i+1)
-            
+
         self.assertEquals(TestCallbacks.called, 100)
 
     def test_callback_userdata_refcount(self):
@@ -325,7 +325,7 @@ class TestCallbacks(unittest.TestCase):
         start_ref_count = getrefcount(ud)
         for i in range(100):
             Everything.test_callback_destroy_notify(callback, ud)
-            
+
         Everything.test_callback_thaw_notifications()
         end_ref_count = getrefcount(ud)
 
diff --git a/tests/test_gdbus.py b/tests/test_gdbus.py
index 5db5d93..af7d399 100644
--- a/tests/test_gdbus.py
+++ b/tests/test_gdbus.py
@@ -15,20 +15,20 @@ class TestGDBusClient(unittest.TestCase):
         self.bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
 
         self.dbus_proxy = Gio.DBusProxy.new_sync(self.bus,
-                Gio.DBusProxyFlags.NONE, None, 
+                Gio.DBusProxyFlags.NONE, None,
                 'org.freedesktop.DBus',
                 '/org/freedesktop/DBus',
                 'org.freedesktop.DBus', None)
 
     def test_native_calls_sync(self):
-        result = self.dbus_proxy.call_sync('ListNames', None, 
+        result = self.dbus_proxy.call_sync('ListNames', None,
                 Gio.DBusCallFlags.NO_AUTO_START, 500, None)
         self.assertTrue(isinstance(result, GLib.Variant))
         result = result.unpack()[0] # result is always a tuple
         self.assertTrue(len(result) > 1)
         self.assertTrue('org.freedesktop.DBus' in result)
 
-        result = self.dbus_proxy.call_sync('GetNameOwner', 
+        result = self.dbus_proxy.call_sync('GetNameOwner',
                 GLib.Variant('(s)', ('org.freedesktop.DBus',)),
                 Gio.DBusCallFlags.NO_AUTO_START, 500, None)
         self.assertTrue(isinstance(result, GLib.Variant))
@@ -45,7 +45,7 @@ class TestGDBusClient(unittest.TestCase):
 
         # error case: invalid argument
         try:
-            self.dbus_proxy.call_sync('GetConnectionUnixProcessID', 
+            self.dbus_proxy.call_sync('GetConnectionUnixProcessID',
                     GLib.Variant('(s)', (' unknown',)),
                     Gio.DBusCallFlags.NO_AUTO_START, 500, None)
             self.fail('call with invalid arguments should raise an exception')
@@ -69,7 +69,7 @@ class TestGDBusClient(unittest.TestCase):
 
         main_loop = GObject.MainLoop()
         data = {'main_loop': main_loop}
-        self.dbus_proxy.call('ListNames', None, 
+        self.dbus_proxy.call('ListNames', None,
                 Gio.DBusCallFlags.NO_AUTO_START, 500, None,
                 call_done, data)
         main_loop.run()
@@ -204,4 +204,3 @@ class TestGDBusClient(unittest.TestCase):
 
         self.assertTrue(isinstance(data['error'], Exception))
         self.assertTrue('InvalidArgs' in str(data['error']), str(data['error']))
-
diff --git a/tests/test_gi.py b/tests/test_gi.py
index 000264b..ed58e88 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -716,33 +716,33 @@ class TestArray(unittest.TestCase):
         self.assertEquals([-1, 0, 1, 2], object_.method_array_return())
 
     def test_array_enum_in(self):
-         GIMarshallingTests.array_enum_in([GIMarshallingTests.Enum.VALUE1,
-                                           GIMarshallingTests.Enum.VALUE2,
-                                           GIMarshallingTests.Enum.VALUE3])
+        GIMarshallingTests.array_enum_in([GIMarshallingTests.Enum.VALUE1,
+                                          GIMarshallingTests.Enum.VALUE2,
+                                          GIMarshallingTests.Enum.VALUE3])
 
     def test_array_boxed_struct_in(self):
-         struct1 = GIMarshallingTests.BoxedStruct()
-         struct1.long_ = 1
-         struct2 = GIMarshallingTests.BoxedStruct()
-         struct2.long_ = 2
-         struct3 = GIMarshallingTests.BoxedStruct()
-         struct3.long_ = 3
+        struct1 = GIMarshallingTests.BoxedStruct()
+        struct1.long_ = 1
+        struct2 = GIMarshallingTests.BoxedStruct()
+        struct2.long_ = 2
+        struct3 = GIMarshallingTests.BoxedStruct()
+        struct3.long_ = 3
 
-         GIMarshallingTests.array_struct_in([struct1, struct2, struct3])
+        GIMarshallingTests.array_struct_in([struct1, struct2, struct3])
 
     def test_array_simple_struct_in(self):
-         struct1 = GIMarshallingTests.SimpleStruct()
-         struct1.long_ = 1
-         struct2 = GIMarshallingTests.SimpleStruct()
-         struct2.long_ = 2
-         struct3 = GIMarshallingTests.SimpleStruct()
-         struct3.long_ = 3
+        struct1 = GIMarshallingTests.SimpleStruct()
+        struct1.long_ = 1
+        struct2 = GIMarshallingTests.SimpleStruct()
+        struct2.long_ = 2
+        struct3 = GIMarshallingTests.SimpleStruct()
+        struct3.long_ = 3
 
-         GIMarshallingTests.array_simple_struct_in([struct1, struct2, struct3])
+        GIMarshallingTests.array_simple_struct_in([struct1, struct2, struct3])
 
     def test_array_multi_array_key_value_in(self):
-         GIMarshallingTests.multi_array_key_value_in(["one", "two", "three"],
-                                                     [1, 2, 3])
+        GIMarshallingTests.multi_array_key_value_in(["one", "two", "three"],
+                                                    [1, 2, 3])
 
     def test_array_fixed_out_struct(self):
         struct1, struct2 = GIMarshallingTests.array_fixed_out_struct()
diff --git a/tests/test_gobject.py b/tests/test_gobject.py
index eef9cf6..4bb7c53 100644
--- a/tests/test_gobject.py
+++ b/tests/test_gobject.py
@@ -123,7 +123,7 @@ class TestReferenceCounting(unittest.TestCase):
         obj.release()
         self.assertEquals(obj.__grefcount__, 1)
 
- 
+
     def testFloatingAndSunkUsingGObjectNew(self):
         # Upon creation, the refcount of the object should be 2:
         # - someone already has a reference on the new object.
diff --git a/tests/test_interface.py b/tests/test_interface.py
index f60a25c..2df61b1 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -46,4 +46,3 @@ class TestIfaceImpl(unittest.TestCase):
         m = MyObject()
         m.iface_method()
         self.assertEqual(m.called, True)
-
diff --git a/tests/test_option.py b/tests/test_option.py
index 2f7e703..3220b2d 100644
--- a/tests/test_option.py
+++ b/tests/test_option.py
@@ -114,4 +114,3 @@ class TestOption(unittest.TestCase):
 
         assert (sio.getvalue().split('\n')[-2] ==
                 "Exception: " + self.EXCEPTION_MESSAGE)
-
diff --git a/tests/test_overrides.py b/tests/test_overrides.py
index 68d6186..1da1b36 100644
--- a/tests/test_overrides.py
+++ b/tests/test_overrides.py
@@ -335,15 +335,15 @@ class TestGLib(unittest.TestCase):
 
         self.assertEqual(GLib.Variant.split_signature('(iso)'), ['i', 's', 'o'])
 
-        self.assertEqual(GLib.Variant.split_signature('(s(ss)i(ii))'), 
+        self.assertEqual(GLib.Variant.split_signature('(s(ss)i(ii))'),
                 ['s', '(ss)', 'i', '(ii)'])
 
         self.assertEqual(GLib.Variant.split_signature('(as)'), ['as'])
 
-        self.assertEqual(GLib.Variant.split_signature('(s(ss)iaiaasa(ii))'), 
+        self.assertEqual(GLib.Variant.split_signature('(s(ss)iaiaasa(ii))'),
                 ['s', '(ss)', 'i', 'ai', 'aas', 'a(ii)'])
 
-        self.assertEqual(GLib.Variant.split_signature('(a{iv}(ii)((ss)a{s(ss)}))'), 
+        self.assertEqual(GLib.Variant.split_signature('(a{iv}(ii)((ss)a{s(ss)}))'),
                 ['a{iv}', '(ii)', '((ss)a{s(ss)})'])
 
     def test_variant_hash(self):
@@ -964,41 +964,41 @@ class TestGtk(unittest.TestCase):
 
         treeiter = tree_store.iter_children(parent)
         while treeiter:
-           i = tree_store.get_value(treeiter, 0)
-           s = tree_store.get_value(treeiter, 1)
-           obj = tree_store.get_value(treeiter, 2)
-           obj.check(i, s)
-           obj2 = tree_store.get_value(treeiter, 3)
-           self.assertEquals(obj, obj2);
-
-           pyobj = tree_store.get_value(treeiter, 4)
-           self.assertEquals(pyobj, test_pyobj)
-           pydict = tree_store.get_value(treeiter, 5)
-           self.assertEquals(pydict, test_pydict)
-           pylist = tree_store.get_value(treeiter, 6)
-           self.assertEquals(pylist, test_pylist)
-
-           bool_1 = tree_store.get_value(treeiter, 7)
-           bool_2 = tree_store.get_value(treeiter, 8)
-           self.assertEquals(bool_1, bool_2)
-           self.assertTrue(isinstance(bool_1, bool))
-           self.assertTrue(isinstance(bool_2, bool))
-
-           uint_ = tree_store.get_value(treeiter, 9)
-           self.assertEquals(uint_, i)
-           ulong_ = tree_store.get_value(treeiter, 10)
-           self.assertEquals(ulong_, GObject.G_MAXULONG)
-           int64_ = tree_store.get_value(treeiter, 11)
-           self.assertEquals(int64_, GObject.G_MININT64)
-           uint64_ = tree_store.get_value(treeiter, 12)
-           self.assertEquals(uint64_, 0xffffffffffffffff)
-           uchar_ = tree_store.get_value(treeiter, 13)
-           self.assertEquals(ord(uchar_), 254)
-           char_ = tree_store.get_value(treeiter, 14)
-           self.assertEquals(char_, 'a')
-
-           parent = treeiter
-           treeiter = tree_store.iter_children(parent)
+            i = tree_store.get_value(treeiter, 0)
+            s = tree_store.get_value(treeiter, 1)
+            obj = tree_store.get_value(treeiter, 2)
+            obj.check(i, s)
+            obj2 = tree_store.get_value(treeiter, 3)
+            self.assertEquals(obj, obj2);
+
+            pyobj = tree_store.get_value(treeiter, 4)
+            self.assertEquals(pyobj, test_pyobj)
+            pydict = tree_store.get_value(treeiter, 5)
+            self.assertEquals(pydict, test_pydict)
+            pylist = tree_store.get_value(treeiter, 6)
+            self.assertEquals(pylist, test_pylist)
+
+            bool_1 = tree_store.get_value(treeiter, 7)
+            bool_2 = tree_store.get_value(treeiter, 8)
+            self.assertEquals(bool_1, bool_2)
+            self.assertTrue(isinstance(bool_1, bool))
+            self.assertTrue(isinstance(bool_2, bool))
+
+            uint_ = tree_store.get_value(treeiter, 9)
+            self.assertEquals(uint_, i)
+            ulong_ = tree_store.get_value(treeiter, 10)
+            self.assertEquals(ulong_, GObject.G_MAXULONG)
+            int64_ = tree_store.get_value(treeiter, 11)
+            self.assertEquals(int64_, GObject.G_MININT64)
+            uint64_ = tree_store.get_value(treeiter, 12)
+            self.assertEquals(uint64_, 0xffffffffffffffff)
+            uchar_ = tree_store.get_value(treeiter, 13)
+            self.assertEquals(ord(uchar_), 254)
+            char_ = tree_store.get_value(treeiter, 14)
+            self.assertEquals(char_, 'a')
+
+            parent = treeiter
+            treeiter = tree_store.iter_children(parent)
 
         self.assertEquals(i, 99)
 
@@ -1113,7 +1113,7 @@ class TestGtk(unittest.TestCase):
         list_store.set_value(treeiter, 2, TestGtk.TestClass(self, i, label))
         list_store.set_value(treeiter, 4, test_pydict)
         list_store.set_value(treeiter, 7, True)
- 
+
         # this should append
         i = 99
         label = 'this is row #99'
diff --git a/tests/test_properties.py b/tests/test_properties.py
index b132a66..8a73ab8 100644
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -90,7 +90,7 @@ class TestProperties(unittest.TestCase):
         self.assertEqual(obj.props.construct, "456")
         obj.props.construct = '789'
         self.assertEqual(obj.props.construct, "789")
-   
+
     def testUTF8(self):
         obj = new(PropertyObject, construct_only=UNICODE_UTF8)
         self.assertEqual(obj.props.construct_only, TEST_UTF8)
diff --git a/tests/test_uris.py b/tests/test_uris.py
index 8174324..c223d3e 100644
--- a/tests/test_uris.py
+++ b/tests/test_uris.py
@@ -12,4 +12,3 @@ class TestUris(unittest.TestCase):
         assert uri_list[0] == "http://www.huh.org/books/foo.html";
         assert uri_list[1] == "http://www.huh.org/books/foo.pdf";
         assert uri_list[2] == "ftp://ftp.foo.org/books/foo.txt";
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]