From 2663a950255fa641c5d6285db72a537c89a0caba Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Mon, 27 Aug 2012 14:45:37 +0100 Subject: [PATCH] Added deprecation warnings to remaining uses of get_deprecated_singleton_config --- tests/basetest.py | 3 +-- tests/testwriter.py | 4 ++-- zeroinstall/injector/model.py | 4 ++-- zeroinstall/injector/reader.py | 4 ++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/basetest.py b/tests/basetest.py index 8399db2..4e5bb19 100755 --- a/tests/basetest.py +++ b/tests/basetest.py @@ -17,7 +17,7 @@ os.environ['LANGUAGE'] = 'C' sys.path.insert(0, '..') from zeroinstall.injector import qdom -from zeroinstall.injector import iface_cache, download, distro, model, handler, policy, reader, trust +from zeroinstall.injector import iface_cache, download, distro, model, handler, reader, trust from zeroinstall.zerostore import NotStored, Store, Stores; Store._add_with_helper = lambda *unused: False from zeroinstall import support, apps from zeroinstall.support import basedir, tasks @@ -196,7 +196,6 @@ class BaseTest(unittest.TestCase): del os.environ['DISPLAY'] self.config = TestConfig() - policy._config = self.config # XXX iface_cache.iface_cache = self.config.iface_cache logging.getLogger().setLevel(logging.WARN) diff --git a/tests/testwriter.py b/tests/testwriter.py index 095b367..6580a97 100755 --- a/tests/testwriter.py +++ b/tests/testwriter.py @@ -112,12 +112,12 @@ class TestWriter(BaseTest): self.assertEqual([], iface.extra_feeds) # Check feeds are automatically removed again - reader.update_from_cache(iface) + reader.update_from_cache(iface, iface_cache = self.config.iface_cache) self.assertEqual(1, len(iface.extra_feeds)) shutil.rmtree(basedir.load_first_data('0install.net', 'site-packages', 'http:##example.com#prog.xml')) - reader.update_from_cache(iface) + reader.update_from_cache(iface, iface_cache = self.config.iface_cache) self.assertEqual(0, len(iface.extra_feeds)) if __name__ == '__main__': diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py index 515ee36..c176b86 100644 --- a/zeroinstall/injector/model.py +++ b/zeroinstall/injector/model.py @@ -878,8 +878,8 @@ class Interface(object): @property def _main_feed(self): - #import warnings - #warnings.warn("use the feed instead", DeprecationWarning, 3) + import warnings + warnings.warn("use the feed instead", DeprecationWarning, 3) from zeroinstall.injector import policy iface_cache = policy.get_deprecated_singleton_config().iface_cache feed = iface_cache.get_feed(self.uri) diff --git a/zeroinstall/injector/reader.py b/zeroinstall/injector/reader.py index 4c7d50d..40cd41f 100644 --- a/zeroinstall/injector/reader.py +++ b/zeroinstall/injector/reader.py @@ -43,6 +43,8 @@ def update_from_cache(interface, iface_cache = None): @rtype: bool""" interface.reset() if iface_cache is None: + import warnings + warnings.warn("iface_cache should be specified", DeprecationWarning, 2) from zeroinstall.injector import policy iface_cache = policy.get_deprecated_singleton_config().iface_cache @@ -220,6 +222,8 @@ def update(interface, source, local = False, iface_cache = None): {'feed_url': feed.url, 'interface_uri': interface.uri}) if iface_cache is None: + import warnings + warnings.warn("iface_cache should be specified", DeprecationWarning, 2) from zeroinstall.injector import policy iface_cache = policy.get_deprecated_singleton_config().iface_cache iface_cache._feeds[support.unicode(interface.uri)] = feed -- 2.11.4.GIT