Rev 435: Workaround gettext's '_' contamination when in __builtin__ namespace by importing it in the module name space. in file:///v/home/vila/.bazaar/plugins/gtk/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Jan 30 11:10:00 GMT 2008
At file:///v/home/vila/.bazaar/plugins/gtk/
------------------------------------------------------------
revno: 435
revision-id:v.ladeuil+lp at free.fr-20080130110959-9eo46wmz0hl5yvww
parent: daniel.schierbeck at gmail.com-20080128131546-vc0ikm3f2w0o7bye
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Wed 2008-01-30 12:09:59 +0100
message:
Workaround gettext's '_' contamination when in __builtin__ namespace by importing it in the module name space.
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
branch.py branch.py-20060718221951-cc4ts04p4d84mjth-1
checkout.py checkout.py-20060731181533-e0x1bgv7wum466kj-1
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
conflicts.py conflicts.py-20070203171806-g5tuxmkf2suxgzvm-1
errors.py errors.py-20070129213417-8rr7unfjjdetfq83-1
initialize.py initialize.py-20070406171439-vi4hce9b12bdofts-1
merge.py merge.py-20061009195451-45vs0pe2nphnckxh-1
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
olive/add.py add.py-20060721181724-0mfkrqwpsa09q1t3-1
olive/bookmark.py bookmark.py-20060820164104-pmg886x25fj6hhyu-1
olive/guifiles.py gladefile.py-20061025081716-mc0e5w3fcin4rcgv-1
olive/info.py info.py-20060810114713-y0f7dshd8ohyr8oz-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
olive/mkdir.py mkdir.py-20060809131310-mpu60gdw82hhkt0p-1
olive/move.py move.py-20060809140408-txw8f17jvqykh0iv-1
olive/remove.py remove.py-20060721181724-0mfkrqwpsa09q1t3-2
olive/rename.py rename.py-20060809143844-edgdedgalykd5zci-1
push.py push.py-20060721181724-0mfkrqwpsa09q1t3-4
revbrowser.py revbrowser.py-20070201094155-v2139s0zp4mmolvq-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
tags.py tags.py-20070408210738-1c0lyfurp88v5c56-1
viz/branchwin.py branchwin.py-20051016222514-15fd120652fcf25c
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2008-01-13 14:15:20 +0000
+++ b/__init__.py 2008-01-30 11:09:59 +0000
@@ -674,7 +674,12 @@
import gettext
gettext.install('olive-gtk')
-
+# Import '_' into module name space just after the installation to protect it
+# from being erased by other uses of '_' as an anonymous variable
+# The other modules needing it can then import it with:
+# from bzrlib.plugins.gtk import _ as _
+import __builtin__
+_ = __builtin__.__dict__['_']
class NoDisplayError(BzrCommandError):
"""gtk could not find a proper display"""
=== modified file 'branch.py'
--- a/branch.py 2007-08-27 12:38:18 +0000
+++ b/branch.py 2008-01-30 11:09:59 +0000
@@ -33,6 +33,8 @@
from branchbox import BranchSelectionBox
+from bzrlib.plugins.gtk import _ as _
+
class BranchDialog(gtk.Dialog):
""" New implementation of the Branch dialog. """
=== modified file 'checkout.py'
--- a/checkout.py 2007-05-17 16:12:27 +0000
+++ b/checkout.py 2008-01-30 11:09:59 +0000
@@ -34,6 +34,8 @@
from history import UrlHistory
from olive import Preferences
+from bzrlib.plugins.gtk import _ as _
+
class CheckoutDialog(gtk.Dialog):
""" New implementation of the Checkout dialog. """
def __init__(self, path=None, parent=None, remote_path=None):
=== modified file 'commit.py'
--- a/commit.py 2007-11-02 22:08:54 +0000
+++ b/commit.py 2008-01-30 11:09:59 +0000
@@ -34,6 +34,8 @@
from dialog import error_dialog, question_dialog
from errors import show_bzr_error
+from bzrlib.plugins.gtk import _ as _
+
try:
import dbus
import dbus.glib
=== modified file 'conflicts.py'
--- a/conflicts.py 2007-07-31 17:11:00 +0000
+++ b/conflicts.py 2008-01-30 11:09:59 +0000
@@ -30,6 +30,8 @@
from dialog import error_dialog, warning_dialog
from errors import show_bzr_error
+from bzrlib.plugins.gtk import _ as _
+
class ConflictsDialog(gtk.Dialog):
""" This dialog displays the list of conflicts. """
def __init__(self, wt, parent=None):
=== modified file 'errors.py'
--- a/errors.py 2007-02-03 14:19:44 +0000
+++ b/errors.py 2008-01-30 11:09:59 +0000
@@ -17,6 +17,8 @@
import bzrlib.errors as errors
from dialog import error_dialog
+from bzrlib.plugins.gtk import _ as _
+
def show_bzr_error(unbound):
"""Decorator that shows bazaar exceptions. """
def convert(*args, **kwargs):
=== modified file 'initialize.py'
--- a/initialize.py 2007-04-06 17:48:23 +0000
+++ b/initialize.py 2008-01-30 11:09:59 +0000
@@ -31,6 +31,8 @@
from bzrlib import transport
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
+
class InitDialog(gtk.Dialog):
""" Initialize dialog. """
def __init__(self, path, parent=None):
=== modified file 'merge.py'
--- a/merge.py 2007-09-11 10:17:33 +0000
+++ b/merge.py 2008-01-30 11:09:59 +0000
@@ -32,6 +32,8 @@
from errors import show_bzr_error
from olive.guifiles import GLADEFILENAME
+from bzrlib.plugins.gtk import _ as _
+
class MergeDialog:
""" Display the Merge dialog and perform the needed actions. """
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2007-10-26 16:18:50 +0000
+++ b/olive/__init__.py 2008-01-30 11:09:59 +0000
@@ -39,6 +39,7 @@
from bzrlib.ui import ui_factory
from bzrlib.workingtree import WorkingTree
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
from bzrlib.plugins.gtk.errors import show_bzr_error
from guifiles import GLADEFILENAME
=== modified file 'olive/add.py'
--- a/olive/add.py 2007-02-03 14:18:57 +0000
+++ b/olive/add.py 2008-01-30 11:09:59 +0000
@@ -28,6 +28,7 @@
import bzrlib.add
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog
from guifiles import GLADEFILENAME
=== modified file 'olive/bookmark.py'
--- a/olive/bookmark.py 2007-02-03 14:18:57 +0000
+++ b/olive/bookmark.py 2008-01-30 11:09:59 +0000
@@ -23,6 +23,7 @@
import gtk
from olive import Preferences
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog
=== modified file 'olive/guifiles.py'
--- a/olive/guifiles.py 2007-04-19 21:30:38 +0000
+++ b/olive/guifiles.py 2008-01-30 11:09:59 +0000
@@ -17,6 +17,8 @@
import os
import sys
+from bzrlib.plugins.gtk import _ as _
+
GLADEFILENAMES = ["/usr/share/olive/olive.glade",
"/usr/local/share/olive/olive.glade",
=== modified file 'olive/info.py'
--- a/olive/info.py 2007-05-17 16:12:27 +0000
+++ b/olive/info.py 2008-01-30 11:09:59 +0000
@@ -25,6 +25,7 @@
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog
from guifiles import GLADEFILENAME
=== modified file 'olive/menu.py'
--- a/olive/menu.py 2007-10-26 16:18:50 +0000
+++ b/olive/menu.py 2008-01-30 11:09:59 +0000
@@ -30,6 +30,7 @@
import bzrlib.errors as errors
from bzrlib.workingtree import WorkingTree
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
from bzrlib.plugins.gtk.errors import show_bzr_error
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
=== modified file 'olive/mkdir.py'
--- a/olive/mkdir.py 2007-02-03 15:24:48 +0000
+++ b/olive/mkdir.py 2008-01-30 11:09:59 +0000
@@ -27,6 +27,7 @@
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
from guifiles import GLADEFILENAME
=== modified file 'olive/move.py'
--- a/olive/move.py 2007-02-03 14:18:57 +0000
+++ b/olive/move.py 2008-01-30 11:09:59 +0000
@@ -29,6 +29,7 @@
import bzrlib.errors as errors
from bzrlib.workingtree import WorkingTree
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog
from errors import show_bzr_error
from guifiles import GLADEFILENAME
=== modified file 'olive/remove.py'
--- a/olive/remove.py 2007-02-03 14:18:57 +0000
+++ b/olive/remove.py 2008-01-30 11:09:59 +0000
@@ -27,6 +27,7 @@
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
from guifiles import GLADEFILENAME
=== modified file 'olive/rename.py'
--- a/olive/rename.py 2007-07-19 14:08:51 +0000
+++ b/olive/rename.py 2008-01-30 11:09:59 +0000
@@ -29,6 +29,7 @@
from bzrlib.workingtree import WorkingTree
from errors import show_bzr_error
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.dialog import error_dialog
from guifiles import GLADEFILENAME
=== modified file 'push.py'
--- a/push.py 2007-09-17 10:33:57 +0000
+++ b/push.py 2008-01-30 11:09:59 +0000
@@ -30,6 +30,8 @@
from bzrlib.config import LocationConfig
import bzrlib.errors as errors
+from bzrlib.plugins.gtk import _ as _
+
from dialog import error_dialog, info_dialog, question_dialog
from history import UrlHistory
=== modified file 'revbrowser.py'
--- a/revbrowser.py 2007-05-18 11:09:31 +0000
+++ b/revbrowser.py 2008-01-30 11:09:59 +0000
@@ -27,6 +27,8 @@
from bzrlib.osutils import format_date
+from bzrlib.plugins.gtk import _ as _
+
class RevisionBrowser(gtk.Dialog):
""" Revision Browser main window. """
=== modified file 'status.py'
--- a/status.py 2007-05-14 10:54:40 +0000
+++ b/status.py 2008-01-30 11:09:59 +0000
@@ -22,6 +22,8 @@
import gtk
+from bzrlib.plugins.gtk import _ as _
+
class StatusDialog(gtk.Dialog):
""" Display Status window and perform the needed actions. """
def __init__(self, wt, wtpath):
=== modified file 'tags.py'
--- a/tags.py 2007-11-02 14:49:57 +0000
+++ b/tags.py 2008-01-30 11:09:59 +0000
@@ -23,6 +23,7 @@
import gtk
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.revisionview import RevisionView
from bzrlib.plugins.gtk.window import Window
=== modified file 'viz/branchwin.py'
--- a/viz/branchwin.py 2008-01-28 13:15:46 +0000
+++ b/viz/branchwin.py 2008-01-30 11:09:59 +0000
@@ -13,6 +13,7 @@
import gobject
import pango
+from bzrlib.plugins.gtk import _ as _
from bzrlib.plugins.gtk.window import Window
from bzrlib.plugins.gtk.tags import AddTagDialog
from bzrlib.plugins.gtk.preferences import PreferencesWindow
More information about the bazaar-commits
mailing list