R-2.6.1

2013-09-12 17:08:52 -05:00
parent be57c3ab5b
commit ed9def985e
28 changed files with 154 additions and 155 deletions
@@ -30,7 +30,7 @@ import re
 import hashlib
 import datetime
 try:
-    import settings
+    from gluon import settings
    have_settings = True
 except ImportError:
    have_settings = False
@@ -423,7 +423,7 @@ class Cache(object):
        """
        # GAE will have a special caching
        if have_settings and settings.global_settings.web2py_runtime_gae:
-            from contrib.gae_memcache import MemcacheClient
+            from gluon.contrib.gae_memcache import MemcacheClient
            self.ram = self.disk = MemcacheClient(request)
        else:
            # Otherwise use ram (and try also disk)