1. ableton
  2. WebHelpers


Mike Orr  committed 6ad1620 Merge

Merge Ben's updates. Re-release version 1.0b1.

  • Participants
  • Parent commits c0078bc, fa9bf4a
  • Branches trunk
  • Tags 1.0b1

Comments (0)

Files changed (3)


View file
  • Ignore whitespace
   - ``rfc3339_date`` now accepts date objects without crashing.
   - Add 'generator' and 'source' properties to RSS2 feeds. Patch by
     Vince Spicer.
+  - Add 'published' property to Atom1 feeds.
 * webhelpers.html.converters:
   - New helper ``render()`` formats HTML to text.
   - New helper ``sanitize()`` strips HTML tags from user input.
 * webhelpers.html.tools:
   - New helper ``strip_tags()`` deletes HTML tags in a string.
 * webhelpers.paginate:
+  - Allow all versions of SQLAlchemy > 0.3.
   - convert "_range" and "_pagelink" function to Page class method so that they
     can be overridden
   - pager "onclick" argument use template string value. So, javascript code can

File webhelpers/feedgenerator.py

View file
  • Ignore whitespace
             handler.addQuickElement(u"link", u"", {u"href": item['link'], u"rel": u"alternate"})
             if item['pubdate'] is not None:
                 handler.addQuickElement(u"updated", rfc3339_date(item['pubdate']).decode('ascii'))
+                handler.addQuickElement(u"published", rfc3339_date(item['pubdate']).decode('ascii'))
             # Author information.
             if item['author_name'] is not None:

File webhelpers/paginate.py

View file
  • Ignore whitespace
     # See if the collection is a sequence
     if isinstance(obj, (list, tuple)):
         return obj
-    # Is SQLAlchemy 0.4 available? (0.3 is not supported - sorry)
-    if sqlalchemy_available.startswith('0.4') or sqlalchemy_available.startswith('0.5'):
+    # Is SQLAlchemy 0.4 or better available? (0.3 is not supported - sorry)
+    if sqlalchemy_available[:3] != '0.3':
         # Is the collection a query?
         if isinstance(obj, sqlalchemy.orm.query.Query):
             return _SQLAlchemyQuery(obj)