summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-07-17 10:24:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-17 10:24:47 -0700
commitc821270d716ca73a998ece17c9d5bf593bdf590e (patch)
treed1692795edf02ae76a20706d9eb2cb57e84a0ef9
parent4b571253095629540ecee414caa9e601ec304e6a (diff)
parent80f50242895afb4b43b231af5e78fcc8c5004206 (diff)
downloadandroid_development-c821270d716ca73a998ece17c9d5bf593bdf590e.tar.gz
android_development-c821270d716ca73a998ece17c9d5bf593bdf590e.tar.bz2
android_development-c821270d716ca73a998ece17c9d5bf593bdf590e.zip
am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
* commit '80f50242895afb4b43b231af5e78fcc8c5004206': Update appengine server to handle '@'.
-rw-r--r--scripts/app_engine_server/memcache_zipserve.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/app_engine_server/memcache_zipserve.py b/scripts/app_engine_server/memcache_zipserve.py
index dfd7de9d0..9c6f42e5b 100644
--- a/scripts/app_engine_server/memcache_zipserve.py
+++ b/scripts/app_engine_server/memcache_zipserve.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# -*- coding: utf-8 -*-
#
# Copyright 2009 Google Inc.
#
@@ -526,6 +527,10 @@ class MemcachedZipHandler(webapp.RequestHandler):
resp_data = None
file_itr = iter(self.zipfilenames)
+ # decode any escape characters in the URI
+ # Note: We are currenty just looking for '@' (%40)
+ file_path = file_path.replace('%40', '@')
+
# check the index, if we have one, to see what archive the file is in
archive_name = self.MapFileToArchive(file_path)
if not archive_name: