Revert "Python 2.5 compatibility"

This reverts commit 3137820.
attilaolah · Dec 16, 2010 · 3b7aaa5 · 3b7aaa5
1 parent 0bf94fb
commit 3b7aaa5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/src/bda/bfg/app/browser/authentication.py b/src/bda/bfg/app/browser/authentication.py
@@ -6,6 +6,7 @@
 from bda.bfg.app.browser.utils import authenticated
 from bda.bfg.app.browser.form import Form
 
+@tile('loginform', permission="login")
 class LoginForm(Form):
 
     @property
@@ -42,6 +43,4 @@ def form(self):
 
     def authenticated(self, widget, data):
         if not authenticated(self.request):
-            raise ExtractionError(u'Invalid Credentials')
-
-LoginForm = tile('loginform', permission="login")(LoginForm)  # Python 2.5
+            raise ExtractionError(u'Invalid Credentials')
diff --git a/src/bda/bfg/app/browser/authoring.py b/src/bda/bfg/app/browser/authoring.py
@@ -22,6 +22,7 @@
 def add(model, request):
     return render_main_template(model, request, contenttilename='add')
 
+@tile('add', 'templates/add.pt', permission='login', strict=False)
 class AddTile(ProtectedContentTile):
 
     @property
@@ -44,8 +45,6 @@ def info(self):
             return None
         return getNodeInfo(factory)
 
-AddTile = tile('add', 'templates/add.pt', permission='login', strict=False)(AddTile)
-
 @bfg_view('edit', permission='login')
 def edit(model, request):
     return render_main_template(model, request, contenttilename='edit')
@@ -56,6 +55,7 @@ def edit(model, request):
              permission='login',
              strict=False)
 
+@tile('add_dropdown', 'templates/add_dropdown.pt', strict=False)
 class AddDropdown(Tile):
 
     @property
@@ -80,9 +80,7 @@ def items(self):
             ret.append(props)
         return ret
 
-AddDropdown = tile('add_dropdown', 'templates/add_dropdown.pt', strict=False)(AddDropdown)
-
 registerTile('contextmenu',
              'bda.bfg.app:browser/templates/contextmenu.pt',
              permission='login',
-             strict=True)
+             strict=True)
diff --git a/src/bda/bfg/app/browser/contents.py b/src/bda/bfg/app/browser/contents.py
@@ -12,6 +12,7 @@
     format_date,
 )
 
+@tile('contents', 'templates/contents.pt', strict=False)
 class ContentsTile(Tile):
 
     @property
@@ -37,8 +38,6 @@ def th_defs(self, sortkey):
         css = selected and order or ''
         return css, sorturl
 
-ContentsTile = tile('contents', 'templates/contents.pt', strict=False)(ContentsTile)
-
 FAR_PAST = datetime.datetime(2000, 1, 1)
 
 class Contents(object):
@@ -117,4 +116,4 @@ def vocab(self):
                 'visible': True,
                 'url': url,
             })
-        return ret
+        return ret
diff --git a/src/bda/bfg/app/browser/layout.py b/src/bda/bfg/app/browser/layout.py
@@ -23,12 +23,12 @@ def __call__(self, model, request):
             return render_tile(model, request, 'loginform')
         return Tile.__call__(self, model, request)
 
+@tile('personaltools', 'templates/personaltools.pt', strict=False)
 class PersonalTools(Tile):
     """Personal tool tile.
     """
 
-PersonalTools = tile('personaltools', 'templates/personaltools.pt', strict=False)(PersonalTools)
-
+@tile('mainmenu', 'templates/mainmenu.pt', strict=False)
 class MainMenu(Tile):
     """Main Menu tile.
     
@@ -76,8 +76,7 @@ def menuitems(self):
             count += 1
         return ret
 
-MainMenu = tile('mainmenu', 'templates/mainmenu.pt', strict=False)(MainMenu)
-
+@tile('pathbar', 'templates/pathbar.pt', strict=False)
 class PathBar(Tile):
 
     @property
@@ -99,8 +98,7 @@ def items(self):
         ret.reverse()
         return ret
 
-PathBar = tile('pathbar', 'templates/pathbar.pt', strict=False)(PathBar)
-
+@tile('navtree', 'templates/navtree.pt', strict=False)
 class NavTree(Tile):
     """Navigation tree tile.
     """
@@ -155,19 +153,16 @@ def rendertree(self, children, level=1):
                                children=children,
                                level=level)
 
-NavTree = tile('navtree', 'templates/navtree.pt', strict=False)(NavTree)
-
+@tile('byline', 'templates/byline.pt', strict=False)
 class Byline(Tile):
     """Byline tile.
     """
 
     def format_date(self, dt):
         return format_date(dt)
 
-Byline = tile('byline', 'templates/byline.pt', strict=False)(Byline)
-
 registerTile('listing',
              'bda.bfg.app:browser/templates/listing.pt',
              class_=ProtectedContentTile,
              permission='login',
-             strict=False)
+             strict=False)
diff --git a/src/bda/bfg/app/browser/referencebrowser.py b/src/bda/bfg/app/browser/referencebrowser.py
@@ -35,6 +35,7 @@
              class_=PathBar,
              strict=False)
 
+@tile('referencelisting', 'templates/referencelisting.pt', strict=False)
 class ReferenceListing(ContentsTile):
 
     @property
@@ -43,8 +44,6 @@ def batch(self):
         batch.name = 'referencebatch'
         return batch(self.model, self.request)
 
-ReferenceListing = tile('referencelisting', 'templates/referencelisting.pt', strict=False)(ReferenceListing)
-
 def reference_extractor(widget, data):
     if widget.attrs.get('multivalued'):
         return select_extractor(widget, data)
@@ -94,4 +93,4 @@ def reference_renderer(widget, data):
     [
         reference_renderer,
     ],
-)
+)