From d125ee3a076d42585f1f6b59cbd7ee59d26aa681 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 29 May 2010 17:24:14 +0100 Subject: [PATCH] Don't translate warnings: Pythons warnings module doesn't support Unicode --- zeroinstall/injector/gpg.py | 2 +- zeroinstall/injector/handler.py | 4 ++-- zeroinstall/injector/iface_cache.py | 4 ++-- zeroinstall/injector/policy.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zeroinstall/injector/gpg.py b/zeroinstall/injector/gpg.py index d523a5e..3b88f53 100644 --- a/zeroinstall/injector/gpg.py +++ b/zeroinstall/injector/gpg.py @@ -312,7 +312,7 @@ def check_stream(stream): return _check_xml_stream(stream) elif start == '-----B': import warnings - warnings.warn(_("Plain GPG-signed feeds are deprecated!"), DeprecationWarning, stacklevel = 2) + warnings.warn("Plain GPG-signed feeds are deprecated!", DeprecationWarning, stacklevel = 2) os.lseek(stream.fileno(), 0, 0) return _check_plain_stream(stream) else: diff --git a/zeroinstall/injector/handler.py b/zeroinstall/injector/handler.py index a991b32..204247f 100644 --- a/zeroinstall/injector/handler.py +++ b/zeroinstall/injector/handler.py @@ -167,7 +167,7 @@ class Handler(object): # old-style class from zeroinstall.injector import iface_cache import warnings - warnings.warn(_("Should override confirm_import_feed(); using old confirm_trust_keys() for now"), DeprecationWarning, stacklevel = 2) + warnings.warn("Should override confirm_import_feed(); using old confirm_trust_keys() for now", DeprecationWarning, stacklevel = 2) iface = iface_cache.iface_cache.get_interface(pending.url) return self.confirm_trust_keys(iface, pending.sigs, pending.new_xml) @@ -286,7 +286,7 @@ class Handler(object): @return: a blocker, if confirmation will happen asynchronously, or None @rtype: L{tasks.Blocker}""" import warnings - warnings.warn(_("Use confirm_keys, not confirm_trust_keys"), DeprecationWarning, stacklevel = 2) + warnings.warn("Use confirm_keys, not confirm_trust_keys", DeprecationWarning, stacklevel = 2) from zeroinstall.injector import trust, gpg assert sigs valid_sigs = [s for s in sigs if isinstance(s, gpg.ValidSig)] diff --git a/zeroinstall/injector/iface_cache.py b/zeroinstall/injector/iface_cache.py index 6a0853b..aa7cb0c 100644 --- a/zeroinstall/injector/iface_cache.py +++ b/zeroinstall/injector/iface_cache.py @@ -187,7 +187,7 @@ class IfaceCache(object): def update_interface_if_trusted(self, interface, sigs, xml): import warnings - warnings.warn(_("Use update_feed_if_trusted instead"), DeprecationWarning, stacklevel = 2) + warnings.warn("Use update_feed_if_trusted instead", DeprecationWarning, stacklevel = 2) return self.update_feed_if_trusted(interface.uri, sigs, xml) def update_feed_if_trusted(self, feed_url, sigs, xml): @@ -212,7 +212,7 @@ class IfaceCache(object): def update_interface_from_network(self, interface, new_xml, modified_time): import warnings - warnings.warn(_("Use update_feed_from_network instead"), DeprecationWarning, stacklevel = 2) + warnings.warn("Use update_feed_from_network instead", DeprecationWarning, stacklevel = 2) self.update_feed_from_network(interface.uri, new_xml, modified_time) def update_feed_from_network(self, feed_url, new_xml, modified_time): diff --git a/zeroinstall/injector/policy.py b/zeroinstall/injector/policy.py index ca40448..309d752 100644 --- a/zeroinstall/injector/policy.py +++ b/zeroinstall/injector/policy.py @@ -408,5 +408,5 @@ class Policy(object): def get_interface(self, uri): """@deprecated: use L{iface_cache.IfaceCache.get_interface} instead""" import warnings - warnings.warn(_("Policy.get_interface is deprecated!"), DeprecationWarning, stacklevel = 2) + warnings.warn("Policy.get_interface is deprecated!", DeprecationWarning, stacklevel = 2) return iface_cache.get_interface(uri) -- 2.11.4.GIT