Automatically map urls to their raw appengine forms

third_party/upload.py

Index: third_party/upload.py
diff --git a/third_party/upload.py b/third_party/upload.py
index 0104166c023a5d029fe367be5d65baea641940d3..7ff42cc96450528b53be2e8e5c542cfcf038e610 100755
--- a/third_party/upload.py
+++ b/third_party/upload.py
@@ -55,6 +55,8 @@ import urlparse
 
 from multiprocessing.pool import ThreadPool
 
+import appengine_mapper
+
 # The configparser module was renamed in Python 3.
 try:
   import configparser
@@ -443,6 +445,7 @@ class AbstractRpcServer(object):
         tries += 1
         args = dict(kwargs)
         url = "%s%s%s" % (self.host, self.request_path_prefix, request_path)
+        url = appengine_mapper.MapUrl(url)
         if args:
           url += "?" + urllib.urlencode(args)
         req = self._CreateRequest(url=url, data=payload)