diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1f1359064..087f0a309 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,10 @@
 2004-11-18  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/ColumnOrder.py: pychecker fixes
+	* src/DateParser.py: pychecker fixes
+	* src/DisplayModels.py: pychecker fixes
+	* src/gramps_main.py: pychecker fixes
+	* src/dates/Date_fr.py: pychecker fixes
+	* src/dates/Date_ru.py: pychecker fixes
 	* src/FamilyView.py: Handle reordering of spouses by drag
 	and drop
 	* src/RelLib.py: Allow the family list to be set externally
diff --git a/gramps2/src/ColumnOrder.py b/gramps2/src/ColumnOrder.py
index b657020a6..fcbb3a45a 100644
--- a/gramps2/src/ColumnOrder.py
+++ b/gramps2/src/ColumnOrder.py
@@ -78,6 +78,5 @@ class ColumnOrder:
 
     def toggled(self, cell, path, model):
         node = model.get_iter((int(path),))
-        value = model.get_value(node,0)
-        value = not value
+        value = not model.get_value(node,0)
         model.set(node,0,value)
diff --git a/gramps2/src/DateParser.py b/gramps2/src/DateParser.py
index 4f4948102..238651fb4 100644
--- a/gramps2/src/DateParser.py
+++ b/gramps2/src/DateParser.py
@@ -34,7 +34,6 @@ __version__ = "$Revision$"
 #
 #-------------------------------------------------------------------------
 import re
-import time
 import locale
 import calendar
 
diff --git a/gramps2/src/DisplayModels.py b/gramps2/src/DisplayModels.py
index 75f05f388..90e0a0282 100644
--- a/gramps2/src/DisplayModels.py
+++ b/gramps2/src/DisplayModels.py
@@ -28,6 +28,8 @@ import time
 import gobject
 import gtk
 
+from gettext import gettext as _
+
 _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/dates/Date_fr.py b/gramps2/src/dates/Date_fr.py
index 7e2cec340..3ac6500aa 100644
--- a/gramps2/src/dates/Date_fr.py
+++ b/gramps2/src/dates/Date_fr.py
@@ -31,7 +31,6 @@ French-specific classes for parsing and displaying dates.
 #
 #-------------------------------------------------------------------------
 import re
-import calendar
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps2/src/dates/Date_ru.py b/gramps2/src/dates/Date_ru.py
index 6e340cae9..9249af901 100644
--- a/gramps2/src/dates/Date_ru.py
+++ b/gramps2/src/dates/Date_ru.py
@@ -31,7 +31,6 @@ Russian-specific classes for parsing and displaying dates.
 #
 #-------------------------------------------------------------------------
 import re
-import calendar
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index ba39c340f..7e7bb8614 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -72,6 +72,7 @@ import DbPrompter
 import TipOfDay
 import ArgHandler
 import Exporter
+import RelImage
 
 from QuestionDialog import *
 
@@ -1075,12 +1076,10 @@ class Gramps:
         return 1
 
     def save_media(self,filename):
-        import RelImage
         missmedia_action = 0
         #-------------------------------------------------------------------------
         def remove_clicked():
             # File is lost => remove all references and the object itself
-            mobj = self.db.get_object_from_handle(ObjectId)
             for p in self.db.get_family_handle_map().values():
                 nl = p.get_media_list()
                 for o in nl: