ianb / PickyWiki / changeset / f4eda24447fa

Up to file-list lib/python/appengine_monkey.py:

@@ -52,15 +52,15 @@ def release_lock():
 def load_module(fullname, fp, filename, etc):
     pass
 #@patch(imp)
 #def find_module(subname, path):
 #    for p in path:
 #        full_py = os.path.join(p, subname + '.py')
 #        full_dir = os.path.join(p, subname, '__init__.py')
 #        for full in full_py, full_dir:
 #            if os.path.exists(full):
 #                return open(full), full, None
 #    return None, '', None
 @patch(imp)
 def find_module(subname, path):
     for p in path:
         full_py = os.path.join(p, subname + '.py')
         full_dir = os.path.join(p, subname, '__init__.py')
         for full in full_py, full_dir:
             if os.path.exists(full):
                 return open(full), full, None
     return None, '', None
 @patch(imp)
 def get_magic():

Up to file-list lib/python/tempita/__init__.py:

@@ -148,7 +148,7 @@ class Template(object):
                     % (args[0],))
             kw = args[0]
         ns = self.default_namespace.copy()
-        ns['__name__'] = self.name
+        ns['__template_name__'] = self.name
         ns.update(self.namespace)
         ns.update(kw)
         result, defs, inherit = self._interpret(ns)
@@ -292,6 +292,7 @@ class Template(object):
         try:
             exec code in ns
         except:
             import logging; logging.warn('Code: %r' % code)
             exc_info = sys.exc_info()
             e = exc_info[1]
             if e.args:
@@ -770,8 +771,12 @@ def parse_expr(tokens, name, context=())
     expr = expr.strip()
     if expr.startswith('py:'):
         expr = expr[3:].lstrip(' \t')
         if expr.startswith('\n'):
             expr = expr[1:]
         if expr.startswith('\n') or expr.startswith('\r'):
             expr = expr.lstrip('\r\n')
             if '\r' in expr:
                 expr = expr.replace('\r\n', '\n')
                 expr = expr.replace('\r', '')
             expr += '\n'
         else:
             if '\n' in expr:
                 raise TemplateError(

Up to file-list pickywiki/db.py:

@@ -26,9 +26,9 @@ class _AnonymousUser(object):
 anonymous = _AnonymousUser()
-def current_user():
+def current_user(return_anonymous=True):
     user = users.get_current_user()
-    if user is None:
+    if user is None and return_anonymous:
         return anonymous
     return user
@@ -158,7 +158,7 @@ class Page(db.Expando):
             type='redirect',
             content=new_path,
             created=datetime.now(),
-            last_edited_by=current_user(),
+            last_edited_by=current_user(False),
             title='Redirect to %s' % new_path,
             parent_page=None)
         return redir_page
@@ -176,7 +176,8 @@ class Page(db.Expando):
         template='puzzle',
         resource='cog',
         binary='cog',
-        redirect='arrow_right')
+        redirect='arrow_right',
         link='arrow_right')
     def icon_img(self):
         return html('<img src="%s" class="icon">' % self.icon())
@@ -285,7 +286,7 @@ class Page(db.Expando):
         assert self.path != '__unspecified__'
         if not self.uuid:
             self.uuid = self.make_uuid()
-        self.last_updated_by = current_user()
+        self.last_updated_by = current_user(False)
         storage = get_request().storage
         if storage:
             if self.last_edited_by:
@@ -513,11 +514,10 @@ class KnownUser(db.Model):
     def check_user(cls):
         """Puts the current user into the database if necessary"""
         user = current_user()
-        if user is None:
+        if user is None or user.email() is None:
             return
         key = 'known_user.%s' % user.email()
         result = memcache.get(key)
         import logging; logging.warn('data %r', [user, key, result])
         if result is None:
             existing = cls.all().filter('user=', user).get()
             if existing is None:
@@ -600,7 +600,6 @@ def has_permission(application, permissi
             result = True
             break
         perms = RolePermission.permissions(role)
         import logging; logging.warn('got perms %r for %s for %s' % (perms, role, user))
         if application in perms and permission in perms[application]:
             result = True
             break

commit 62:	f4eda24447fa
parent 61:	586f695a0046
branch:	default