From e2a4d9fe2c8f11ee3e036a7b0b901cc6ecf4a16d Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 5 Feb 2015 14:22:01 -0500 Subject: [PATCH] Test interposition with real example and fix issues encountered Fix issues with 'configuration' variable name and incorrect reference to 'six.moves.urllib.request.Request'. --- tuf/interposition/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tuf/interposition/__init__.py b/tuf/interposition/__init__.py index a3f5c02e..e6f61bc0 100755 --- a/tuf/interposition/__init__.py +++ b/tuf/interposition/__init__.py @@ -165,7 +165,7 @@ def __urllib2_urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): updater = None # If this is a urllib2.Request... - if isinstance(url, six.moves.request.Request): + if isinstance(url, six.moves.urllib.request.Request): # If this is a GET HTTP method... if url.get_method() == "GET": # ...then you should check with TUF. @@ -343,7 +343,7 @@ def refresh(configurations): def deconfigure(configurations): """Remove TUF interposition for previously read configurations.""" - for configuration in six.itervalues(configuration): + for configuration in six.itervalues(configurations): __updater_controller.remove(configuration)