fixed some problems with admin no GAE, still readonly
This commit is contained in:
+4
-2
@@ -14,6 +14,7 @@ FOR INTERNAL USE ONLY
|
||||
|
||||
import os
|
||||
import thread
|
||||
import logging
|
||||
from fileutils import read_file
|
||||
|
||||
cfs = {} # for speed-up
|
||||
@@ -34,15 +35,16 @@ def getcfs(key, filename, filter=None):
|
||||
This is used on Google App Engine since pyc files cannot be saved.
|
||||
"""
|
||||
try:
|
||||
logging.info(filename)
|
||||
t = os.stat(filename).st_mtime
|
||||
except OSError:
|
||||
return filter()
|
||||
return filter() if callable(filter) else ''
|
||||
cfs_lock.acquire()
|
||||
item = cfs.get(key, None)
|
||||
cfs_lock.release()
|
||||
if item and item[0] == t:
|
||||
return item[1]
|
||||
if not filter:
|
||||
if not callable(filter):
|
||||
data = read_file(filename)
|
||||
else:
|
||||
data = filter()
|
||||
|
||||
+1
-1
@@ -4329,9 +4329,9 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
|
||||
|
||||
def select_raw(self,query,fields=None,attributes=None):
|
||||
db = self.db
|
||||
args_get = attributes.get
|
||||
fields = fields or []
|
||||
attributes = attributes or {}
|
||||
args_get = attributes.get
|
||||
new_fields = []
|
||||
for item in fields:
|
||||
if isinstance(item,SQLALL):
|
||||
|
||||
+4
-1
@@ -429,7 +429,10 @@ class translator(object):
|
||||
self.request = request
|
||||
self.folder = request.folder
|
||||
self.langpath = ospath.join(self.folder,'languages')
|
||||
self.filenames = set(os.listdir(self.langpath))
|
||||
try:
|
||||
self.filenames = set(os.listdir(self.langpath))
|
||||
except:
|
||||
self.filenames = set()
|
||||
self.http_accept_language = request.env.http_accept_language
|
||||
# self.cache # filled in self.force()
|
||||
# self.accepted_language = None # filled in self.force()
|
||||
|
||||
Reference in New Issue
Block a user