提交: 3bd73827e847f98752873cca3b28c093137a920f - allura (git)

allura

Commit MetaInfo

• 修訂: 3bd73827e847f98752873cca3b28c093137a920f (tree)
• 時間: 2010-05-22 03:09:10
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#425] - Fix more 500 errors, fix semantics of contextmanager, trap exceptions in sidebar_menu()

Change Summary

• modified: pyforge/pyforge/ext/admin/admin_main.py
• modified: pyforge/pyforge/ext/project_home/project_main.py
• modified: pyforge/pyforge/ext/sfx/sfx_main.py
• modified: pyforge/pyforge/ext/user_profile/user_main.py
• modified: pyforge/pyforge/lib/custom_middleware.py
• modified: pyforge/pyforge/lib/helpers.py
• modified: pyforge/pyforge/model/project.py
• modified: pyforge/pyforge/pastetemplates/forgeapp/+package+/main.py_tmpl

差異

--- a/pyforge/pyforge/ext/admin/admin_main.py
+++ b/pyforge/pyforge/ext/admin/admin_main.py
@@ -1,4 +1,5 @@
 import difflib
+import logging
 from pprint import pformat
 from collections import defaultdict
 from mimetypes import guess_type
@@ -20,6 +21,8 @@ from pyforge import model as M
 from pyforge.lib.security import require, has_project_access
 from pyforge.lib.widgets import form_fields as ffw
 
+log = logging.getLogger(__name__)
+
 class W:
     markdown_editor = ffw.MarkdownEdit()
     label_edit = ffw.LabelEdit()
@@ -70,6 +73,7 @@ class AdminApp(Application):
         self.templates = pkg_resources.resource_filename('pyforge.ext.admin', 'templates')
         self.sitemap = [ SitemapEntry('Admin','.')]
 
+    @h.exceptionless([], log)
     def sidebar_menu(self):
         admin_url = c.project.url()+'admin/'
         links = [SitemapEntry('Project'),
@@ -121,7 +125,8 @@ class ProjectAdminController(object):
     def overview(self):
         c.markdown_editor = W.markdown_editor
         c.label_edit = W.label_edit
-        return dict(categories=M.ProjectCategory.query.find(dict(parent_id=None)).sort('label').all())
+        categories = M.ProjectCategory.query.find(dict(parent_id=None)).sort('label').all()
+        return dict(categories=categories)
 
     @without_trailing_slash
     @expose('pyforge.ext.admin.templates.project_tools')

--- a/pyforge/pyforge/ext/project_home/project_main.py
+++ b/pyforge/pyforge/ext/project_home/project_main.py
@@ -44,6 +44,7 @@ class ProjectHomeApp(Application):
         return [
             SitemapEntry('Home', '.') ]
 
+    @h.exceptionless([], log)
     def sidebar_menu(self):
         return [ SitemapEntry('Configure', 'configuration')]
 

--- a/pyforge/pyforge/ext/sfx/sfx_main.py
+++ b/pyforge/pyforge/ext/sfx/sfx_main.py
@@ -135,8 +135,10 @@ def fake_pylons_context(request):
     pylons.c._push_object(MagicalC(EmptyClass(), environ))
     pylons.g._push_object(Globals())
     pylons.request._push_object(request)
-    yield
-    pylons.c._pop_object()
-    pylons.g._pop_object()
-    pylons.request._pop_object()
+    try:
+        yield
+    finally:
+        pylons.c._pop_object()
+        pylons.g._pop_object()
+        pylons.request._pop_object()
 

--- a/pyforge/pyforge/ext/user_profile/user_main.py
+++ b/pyforge/pyforge/ext/user_profile/user_main.py
@@ -44,6 +44,7 @@ class UserProfileApp(Application):
         menu_id = 'User'
         return []
 
+    @h.exceptionless([], log)
     def sidebar_menu(self):
         return [ SitemapEntry('Preferences', '/auth/prefs/')]
 

--- a/pyforge/pyforge/lib/custom_middleware.py
+++ b/pyforge/pyforge/lib/custom_middleware.py
@@ -172,9 +172,11 @@ def fake_pylons_context(request):
     pylons.c._push_object(MagicalC(EmptyClass(), environ))
     pylons.g._push_object(Globals())
     pylons.request._push_object(request)
-    yield
-    pylons.c._pop_object()
-    pylons.g._pop_object()
-    pylons.request._pop_object()
+    try:
+        yield
+    finally:
+        pylons.c._pop_object()
+        pylons.g._pop_object()
+        pylons.request._pop_object()
 
 on_import()

--- a/pyforge/pyforge/lib/helpers.py
+++ b/pyforge/pyforge/lib/helpers.py
@@ -77,11 +77,14 @@ def push_config(obj, **kw):
         except AttributeError:
             new_attrs.append(k)
         setattr(obj, k, v)
-    yield obj
-    for k,v in saved_attrs.iteritems():
-        setattr(obj, k, v)
-    for k in new_attrs:
-        delattr(obj, k)
+    try:
+        yield obj
+    finally:
+        for k,v in saved_attrs.iteritems():
+            setattr(obj, k, v)
+        for k in new_attrs:
+            delattr(obj, k)
+
 
 def mixin_reactors(cls, module, prefix=None):
     'attach the reactor-decorated functions in module to the given class'
@@ -117,15 +120,17 @@ def push_context(project_id, mount_point=None, app_config_id=None):
     project = getattr(c, 'project', ())
     app = getattr(c, 'app', ())
     set_context(project_id, mount_point, app_config_id)
-    yield
-    if project == ():
-        del c.project
-    else:
-        c.project = project
-    if app == ():
-        del c.app
-    else:
-        c.app = app
+    try:
+        yield
+    finally:
+        if project == ():
+            del c.project
+        else:
+            c.project = project
+        if app == ():
+            del c.app
+        else:
+            c.app = app
                       
 def encode_keys(d):
     '''Encodes the unicode keys of d, making the result

--- a/pyforge/pyforge/model/project.py
+++ b/pyforge/pyforge/model/project.py
@@ -221,6 +221,7 @@ class Project(MappedClass):
     labels = FieldProperty([str])
     last_updated = FieldProperty(datetime, if_missing=None)
 
+    @h.exceptionless([], log)
     def sidebar_menu(self):
         from pyforge.app import SitemapEntry
         result = []

--- a/pyforge/pyforge/pastetemplates/forgeapp/+package+/main.py_tmpl
+++ b/pyforge/pyforge/pastetemplates/forgeapp/+package+/main.py_tmpl
@@ -52,6 +52,7 @@ class {{egg}}App(Application):
             return [
                 SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
 
+    @h.exceptionless([], log)
     def sidebar_menu(self):
         return [
             SitemapEntry('Home', '.'),