[meld] Minor style and PEP8 fixes

[Kai Willadsen <kaiw src gnome org>]

commit a5f8945c77ae1fc453223304157832205e699830
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Feb 10 08:12:38 2013 +1000

    Minor style and PEP8 fixes

 meld/dirdiff.py     |    3 +--
 meld/preferences.py |   10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 798eb9c..be3794d 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -29,8 +29,6 @@ import time
 import gtk
 import gtk.keysyms
 
-from decimal import Decimal
-
 from . import melddoc
 from . import tree
 from . import misc
@@ -40,6 +38,7 @@ from .ui import gnomeglade
 from .ui import emblemcellrenderer
 
 from collections import namedtuple
+from decimal import Decimal
 from gettext import gettext as _
 from gettext import ngettext
 from .meldapp import app
diff --git a/meld/preferences.py b/meld/preferences.py
index 28110cf..244bbff 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -198,7 +198,8 @@ class PreferencesDialog(gnomeglade.Component):
         columnlist = ColumnList(self.prefs, "dirdiff_columns")
         self.column_list_vbox.pack_start(columnlist.widget)
 
-        self.checkbutton_shallow_compare.set_active(self.prefs.dirdiff_shallow_comparison)
+        self.checkbutton_shallow_compare.set_active(
+                self.prefs.dirdiff_shallow_comparison)
 
         self.combo_timestamp.lock = True
         model = gtk.ListStore(str, int)
@@ -273,11 +274,12 @@ class PreferencesDialog(gnomeglade.Component):
 
     def on_checkbutton_shallow_compare_toggled(self, check):
         self.prefs.dirdiff_shallow_comparison = check.get_active()
-    
+
     def on_combo_timestamp_changed(self, combo):
         if not combo.lock:
-            self.prefs.dirdiff_time_resolution_ns = combo.get_model()[combo.get_active_iter()][1]
-    
+            resolution = combo.get_model()[combo.get_active_iter()][1]
+            self.prefs.dirdiff_time_resolution_ns = resolution
+
     def on_response(self, dialog, response_id):
         self.widget.destroy()