[Checkins] SVN: van.timeformat/trunk/ - Accept None as an argument for timefmt and ltimefmt. These functions will now

[Brian Sutherland]

Log message for revision 108295:
  - Accept None as an argument for timefmt and ltimefmt. These functions will now
    return None in this case instead of erroring.
  - Clean up tests.
  - Prepare for release.
  

Changed:
  U   van.timeformat/trunk/CHANGES.txt
  U   van.timeformat/trunk/setup.py
  U   van.timeformat/trunk/van/timeformat/README.txt
  U   van.timeformat/trunk/van/timeformat/__init__.py
  U   van.timeformat/trunk/van/timeformat/ftesting.zcml

-=-
Modified: van.timeformat/trunk/CHANGES.txt
===================================================================
--- van.timeformat/trunk/CHANGES.txt	2010-01-20 08:25:57 UTC (rev 108294)
+++ van.timeformat/trunk/CHANGES.txt	2010-01-20 09:36:20 UTC (rev 108295)
@@ -1,11 +1,20 @@
 Changes
 =======
 
-1.0.1 (unknown)
+1.1.0 (2010-01-20)
 ------------------
 
+Features:
+
+- Accept None as an argument for timefmt and ltimefmt. These functions will now
+  return None in this case instead of erroring.
+
+Bugfixes:
+
 - Re-add tests mistakenly removed.
 - Update dependencies: van.testing is only needed for tests.
+- Update tests to run with new ZTK packages.
+- Add author e-mail.
 
 1.0.0 (2008-11-21)
 ------------------

Modified: van.timeformat/trunk/setup.py
===================================================================
--- van.timeformat/trunk/setup.py	2010-01-20 08:25:57 UTC (rev 108294)
+++ van.timeformat/trunk/setup.py	2010-01-20 09:36:20 UTC (rev 108295)
@@ -25,9 +25,10 @@
     )
 
 setup(name="van.timeformat",
-      version='1.0.1dev',
+      version='1.1.0',
       license='ZPL 2.1',
       url='http://pypi.python.org/pypi/van.timeformat',
+      author_email='zope-dev at zope.org',
       packages=find_packages(),
       author="Vanguardistas LLC",
       description="Convienience functions for formatting dates/times using zope.i18n and TAL",

Modified: van.timeformat/trunk/van/timeformat/README.txt
===================================================================
--- van.timeformat/trunk/van/timeformat/README.txt	2010-01-20 08:25:57 UTC (rev 108294)
+++ van.timeformat/trunk/van/timeformat/README.txt	2010-01-20 09:36:20 UTC (rev 108295)
@@ -35,6 +35,11 @@
     >>> print timefmt(mydatetime, format='iso')
     1975-12-17T05:24:36
 
+If None is used as an input date, timefmt will return None:
+    
+    >>> timefmt(None) is None
+    True
+
 rfc2822
 +++++++
 
@@ -106,6 +111,10 @@
     >>> print ltimefmt(mydate, german, category="date", length="long")
     17. Dezember 1975
 
+If None is used as an input date, ltimefmt will return None:
+    
+    >>> ltimefmt(None, us) is None
+    True
 
 Localized formatting examples
 +++++++++++++++++++++++++++++
@@ -139,3 +148,4 @@
 
     >>> print ltimefmt(mydatetime, us, category="dateTime", length="long")
     December 17, 1975 5:24:36 AM +000
+

Modified: van.timeformat/trunk/van/timeformat/__init__.py
===================================================================
--- van.timeformat/trunk/van/timeformat/__init__.py	2010-01-20 08:25:57 UTC (rev 108294)
+++ van.timeformat/trunk/van/timeformat/__init__.py	2010-01-20 09:36:20 UTC (rev 108295)
@@ -17,6 +17,8 @@
 from van.timeformat.interfaces import ITimeFormat
 
 def timefmt(obj, format='iso'):
+    if obj is None:
+        return None
     assert isinstance(obj, date), "format only accepts date or datetime objects"
     if format == 'iso':
         s = obj.isoformat()
@@ -27,6 +29,8 @@
     return unicode(s)
 
 def ltimefmt(obj, locale, category=None, length=None):
+    if obj is None:
+        return None
     if category is None:
         if isinstance(obj, datetime):
             category = 'dateTime'

Modified: van.timeformat/trunk/van/timeformat/ftesting.zcml
===================================================================
--- van.timeformat/trunk/van/timeformat/ftesting.zcml	2010-01-20 08:25:57 UTC (rev 108294)
+++ van.timeformat/trunk/van/timeformat/ftesting.zcml	2010-01-20 09:36:20 UTC (rev 108295)
@@ -5,17 +5,14 @@
     xmlns:v="http://namespaces.vanguardistas.net/vanguardistas"
     >
 
-  <include zcml:condition="installed zope.app.pagetemplate"
-      package="zope.app.pagetemplate"
-      file="ftesting.zcml"/>
+  <include package="zope.app.pagetemplate" file="meta.zcml"/>
 
   <include package="van.timeformat" file="meta.zcml"/>
   <include package="van.timeformat"/>
-  
+
   <v:time_format
       name='unicode_test'
       format="%Y-%d-%m Extended Arabic-Indic Digit Seven: Û·:"
       />
 
-
 </configure>