summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-07-17 10:19:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-17 10:19:51 -0700
commitd06f4e3287483de270c9ea7a19acdff24efa1cb0 (patch)
tree1fb71c78e823f0d0edec3b8e0ecf2acb8b3a77ae
parent6dcbcb7a539a7704672cc22dba3ac12cf5622b36 (diff)
parent6ac22572e589d4cab6f2015aa63212d4c7c2a903 (diff)
downloadandroid_development-d06f4e3287483de270c9ea7a19acdff24efa1cb0.tar.gz
android_development-d06f4e3287483de270c9ea7a19acdff24efa1cb0.tar.bz2
android_development-d06f4e3287483de270c9ea7a19acdff24efa1cb0.zip
am 6ac22572: Update appengine server to handle \'@\'.
* commit '6ac22572e589d4cab6f2015aa63212d4c7c2a903': 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: