Refactor startup, reorganising imports and bumping (py)gtk requirement to 2.8

svn path=/trunk/; revision=1025

Author: Kai Willadsen

dirdiff.py

@@ -24,6 +24,8 @@
 import math
 import misc
 import os
+from gettext import gettext as _
+from gettext import ngettext
 import shutil
 import melddoc
 import tree

filediff.py

@@ -19,6 +19,7 @@
 import codecs
 import math
 import os
+from gettext import gettext as _
 import re
 import difflib
 import struct

meld

@@ -33,55 +33,36 @@ sys.path += [ #LIBDIR#
 ]
 import paths
 import gettext
+from gettext import gettext as _
 
-try:
-    gettext.bindtextdomain("meld", paths.locale_dir())
-    gettext.textdomain("meld")
-    gettext.install("meld", paths.locale_dir(), unicode=1)
-except IOError, e:
-    # fake gettext until translations in place
-    print "(meld): WARNING **: %s" % e
-    __builtins__.__dict__["_"] = lambda x : x
-__builtins__.__dict__["ngettext"] = gettext.ngettext
-
-#
-# python version
-#
+gettext.bindtextdomain("meld", paths.locale_dir())
+gettext.textdomain("meld")
 
+# Check requirements: Python 2.3, pygtk 2.8
 pyver = (2,3)
-pygtkver = (2,6,0)
+pygtkver = (2,8,0)
 
-def ver2str(ver):
-    return ".".join(map(str,ver))
+def missing_reqs(mod, ver):
+    modver = mod + " " + ".".join(map(str, ver))
+    print _("Meld requires %s or higher.") % modver
+    sys.exit(1)
 
 if sys.version_info[:2] < pyver:
-    print _("Meld requires %s or higher.") % ("python%s"%ver2str(pyver))
-    sys.exit(1)
+    missing_reqs("Python", pyver)
 
-#
-# pygtk 2 
-#
 try:
     import pygtk
+    pygtk.require("2.0")
+    import gtk
+    import gtk.glade
 except ImportError, e:
     print e
-    print _("Meld requires %s or higher.") % ("pygtk%s"%ver2str(pygtkver))
-    sys.exit(1)
-else:
-    pygtk.require("2.0")
+    missing_reqs("pygtk", pygtkver)
 
-#
-# pygtk version
-#
-import gtk
-import gtk.glade
 if gtk.pygtk_version < pygtkver:
-    print _("Meld requires %s or higher.") % ("pygtk%s"%ver2str(pygtkver))
-    print _("Due to incompatible API changes some functions may not operate as expected.")
+    missing_reqs("pygtk", pygtkver)
 
-#
-# We target pygtk 2.6
-#
+# Ignore deprecation warnings from pygtk > 2.6
 if gtk.pygtk_version >= (2,8,0):
     import warnings
     warnings.filterwarnings("ignore", category=DeprecationWarning)

meldapp.py

@@ -17,6 +17,7 @@
 # system
 import sys
 import os
+from gettext import gettext as _
 
 # gnome
 import gtk

melddoc.py

@@ -19,6 +19,7 @@
 import undo
 import gtk
 import os
+from gettext import gettext as _
 
 # Use these to ensure consistent return values.
 RESULT_OK, RESULT_ERROR = (0,1)

misc.py

@@ -21,6 +21,7 @@
 from __future__ import generators
 import copy
 import os
+from gettext import gettext as _
 import select
 import popen2
 import errno

vc/_vc.py

@@ -22,6 +22,7 @@
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+from gettext import gettext as _
 
 # ignored, new, normal, ignored changes,
 # error, placeholder, vc added

vc/cvs.py

@@ -22,6 +22,7 @@
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+from gettext import gettext as _
 import re
 import time
 import misc

vcview.py

@@ -20,6 +20,7 @@
 import shutil
 import gtk
 import os
+from gettext import gettext as _
 import re
 
 import tree