From: david-sarah <david-sarah@jacaranda.org>
Date: Wed, 10 Nov 2010 00:53:36 +0000 (-0800)
Subject: tahoe_mv.py: use do_http, not urllib.openurl, in order to avoid connecting to the... 
X-Git-Url: https://git.rkrishnan.org/maximilian?a=commitdiff_plain;h=cb777ad14f12a24900500b0e41be378865a1934d;p=tahoe-lafs%2Ftahoe-lafs.git

tahoe_mv.py: use do_http, not urllib.openurl, in order to avoid connecting to the webapi server via a proxy. refs #1253
---

diff --git a/src/allmydata/scripts/tahoe_mv.py b/src/allmydata/scripts/tahoe_mv.py
index 3be219d6..08618cb1 100644
--- a/src/allmydata/scripts/tahoe_mv.py
+++ b/src/allmydata/scripts/tahoe_mv.py
@@ -28,7 +28,11 @@ def mv(options, mode="move"):
     if from_path:
         from_url += "/" + escape_path(from_path)
     # figure out the source cap
-    data = urllib.urlopen(from_url + "?t=json").read()
+    resp = do_http("GET", from_url + "?t=json")
+    if not re.search(r'^2\d\d$', str(resp.status)):
+        print >>stderr, format_http_error("Error", resp)
+        return 1
+    data = resp.read()
     nodetype, attrs = simplejson.loads(data)
     cap = to_str(attrs.get("rw_uri") or attrs["ro_uri"])