meld r1025 - in trunk: . vc
- From: kaiw svn gnome org
- To: svn-commits-list gnome org
- Subject: meld r1025 - in trunk: . vc
- Date: Sun, 20 Jul 2008 11:20:52 +0000 (UTC)
Author: kaiw
Date: Sun Jul 20 11:20:52 2008
New Revision: 1025
URL: http://svn.gnome.org/viewvc/meld?rev=1025&view=rev
Log:
Refactor startup, reorganising imports and bumping (py)gtk requirement to 2.8
Modified:
trunk/dirdiff.py
trunk/filediff.py
trunk/meld
trunk/meldapp.py
trunk/melddoc.py
trunk/misc.py
trunk/vc/_vc.py
trunk/vc/cvs.py
trunk/vcview.py
Modified: trunk/dirdiff.py
==============================================================================
--- trunk/dirdiff.py (original)
+++ trunk/dirdiff.py Sun Jul 20 11:20:52 2008
@@ -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
Modified: trunk/filediff.py
==============================================================================
--- trunk/filediff.py (original)
+++ trunk/filediff.py Sun Jul 20 11:20:52 2008
@@ -19,6 +19,7 @@
import codecs
import math
import os
+from gettext import gettext as _
import re
import difflib
import struct
Modified: trunk/meld
==============================================================================
--- trunk/meld (original)
+++ trunk/meld Sun Jul 20 11:20:52 2008
@@ -33,55 +33,36 @@
]
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)
Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py (original)
+++ trunk/meldapp.py Sun Jul 20 11:20:52 2008
@@ -17,6 +17,7 @@
# system
import sys
import os
+from gettext import gettext as _
# gnome
import gtk
Modified: trunk/melddoc.py
==============================================================================
--- trunk/melddoc.py (original)
+++ trunk/melddoc.py Sun Jul 20 11:20:52 2008
@@ -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)
Modified: trunk/misc.py
==============================================================================
--- trunk/misc.py (original)
+++ trunk/misc.py Sun Jul 20 11:20:52 2008
@@ -21,6 +21,7 @@
from __future__ import generators
import copy
import os
+from gettext import gettext as _
import select
import popen2
import errno
Modified: trunk/vc/_vc.py
==============================================================================
--- trunk/vc/_vc.py (original)
+++ trunk/vc/_vc.py Sun Jul 20 11:20:52 2008
@@ -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
Modified: trunk/vc/cvs.py
==============================================================================
--- trunk/vc/cvs.py (original)
+++ trunk/vc/cvs.py Sun Jul 20 11:20:52 2008
@@ -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
Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py (original)
+++ trunk/vcview.py Sun Jul 20 11:20:52 2008
@@ -20,6 +20,7 @@
import shutil
import gtk
import os
+from gettext import gettext as _
import re
import tree
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]