Fix tests and get ready for release.

CHANGES.txt

@@ -2,7 +2,15 @@
 CHANGES
 =======
 
+0.7.0 (2009-07-24)
+------------------
+
+- Fixed tests to work with latest package versions.
+
+- The buildout now also pulls in the test extras, which is required.
+
 0.6.1 (2008-05-20)
+------------------
 
 - No code changes, and only a very minor documentation tweak.
   Re-released to avoid confusion over package versions found in the wild.

buildout.cfg

@@ -4,4 +4,4 @@ parts = test
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zc.i18n
+eggs = zc.i18n [test]

setup.py

@@ -21,42 +21,48 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-setup(name='zc.i18n',
-      version = '0.6.2dev',
-      author='Zope Corporation and Contributors',
-      author_email='zope3-dev@zope.org',
-      description='Additional I18n Support APIs',
-      long_description=(
-          read('README.txt')
-          + '\n\n' +
-          'Detailed Dcoumentation\n' +
-          '======================\n'
-          + '\n\n' +
-          read('src', 'zc', 'i18n', 'duration.txt')
-          + '\n\n' +
-          read('CHANGES.txt')
-          ),
-      keywords = "zope3 i18n date time duration",
-      classifiers = [
-          'Development Status :: 5 - Production/Stable',
-          'Environment :: Web Environment',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: Zope Public License',
-          'Programming Language :: Python',
-          'Natural Language :: English',
-          'Operating System :: OS Independent',
-          'Topic :: Internet :: WWW/HTTP',
-          'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zc.i18n',
-      license='ZPL 2.1',
-      packages=find_packages('src'),
-      package_dir = {'': 'src'},
-      namespace_packages=['zc'],
-      extras_require=dict(test=['zope.testing']),
-      install_requires=['setuptools',
-                        'zope.i18n',
-                        'zope.i18nmessageid',
-                        'zope.interface'],
-      include_package_data = True,
-      zip_safe = False,
-      )
+setup(
+    name='zc.i18n',
+    version = '0.7.0',
+    author='Zope Corporation and Contributors',
+    author_email='zope3-dev@zope.org',
+    description='Additional I18n Support APIs',
+    long_description=(
+        read('README.txt')
+        + '\n\n' +
+        'Detailed Dcoumentation\n' +
+        '======================\n'
+        + '\n\n' +
+        read('src', 'zc', 'i18n', 'duration.txt')
+        + '\n\n' +
+        read('CHANGES.txt')
+        ),
+    keywords = "zope3 i18n date time duration",
+    classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Zope Public License',
+        'Programming Language :: Python',
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'Topic :: Internet :: WWW/HTTP',
+        'Framework :: Zope3'],
+    url='http://cheeseshop.python.org/pypi/zc.i18n',
+    license='ZPL 2.1',
+    packages=find_packages('src'),
+    package_dir = {'': 'src'},
+    namespace_packages=['zc'],
+    extras_require=dict(
+        test=['zope.testing',
+              'zope.publisher',
+              ]),
+    install_requires=[
+        'setuptools',
+        'zope.i18n',
+        'zope.i18nmessageid',
+        'zope.interface',
+        ],
+    include_package_data = True,
+    zip_safe = False,
+    )

src/zc/i18n/date.py

@@ -82,7 +82,7 @@ def normalize(request, dt):
     >>> normalize(request,dt)
     Traceback (most recent call last):
     ...
-    AmbiguousTimeError: 2006-03-26 03:30:00
+    NonExistentTimeError: 2006-03-26 03:30:00
 
     An ambiguous time:
 
@@ -98,4 +98,4 @@ def normalize(request, dt):
         tzinfo = ITZInfo(request)
         dt = tzinfo.localize(dt, is_dst=None)
 
-    return dt.astimezone(pytz.utc)
+    return dt.astimezone(pytz.utc)