[Checkins] SVN: zope.error/trunk/ Drop support for Python 2.4 and 2.5.

[Tres Seaver]

Log message for revision 126107:
  Drop support for Python 2.4 and 2.5.
  
  Replace deprecated 'zope.interface.implements' usage with equivalent
  'zope.interface.implementer' decorator.
  
  

Changed:
  U   zope.error/trunk/CHANGES.txt
  U   zope.error/trunk/setup.py
  U   zope.error/trunk/src/zope/error/error.py

-=-
Modified: zope.error/trunk/CHANGES.txt
===================================================================
--- zope.error/trunk/CHANGES.txt	2012-05-18 14:06:56 UTC (rev 126106)
+++ zope.error/trunk/CHANGES.txt	2012-05-18 14:09:35 UTC (rev 126107)
@@ -2,12 +2,15 @@
 CHANGES
 =======
 
-3.7.5 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
 
+- Dropped support for Python 2.4 and 2.5.
 
+
 3.7.4 (2012-02-01)
 ------------------
 

Modified: zope.error/trunk/setup.py
===================================================================
--- zope.error/trunk/setup.py	2012-05-18 14:06:56 UTC (rev 126106)
+++ zope.error/trunk/setup.py	2012-05-18 14:09:35 UTC (rev 126107)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.error',
-    version='3.7.5dev',
+    version='4.0.0dev',
     author='Zope Foundation and Contributors',
     author_email='zope-dev at zope.org',
     description = "An error reporting utility for Zope3",
@@ -44,6 +44,9 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

Modified: zope.error/trunk/src/zope/error/error.py
===================================================================
--- zope.error/trunk/src/zope/error/error.py	2012-05-18 14:06:56 UTC (rev 126106)
+++ zope.error/trunk/src/zope/error/error.py	2012-05-18 14:09:35 UTC (rev 126107)
@@ -26,7 +26,7 @@
 from threading import Lock
 
 from zope.exceptions.exceptionformatter import format_exception
-from zope.interface import implements
+from zope.interface import implementer
 
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.interfaces import ILocalErrorReportingUtility
@@ -88,10 +88,11 @@
         lines.append(line)
     return u"".join(lines)
 
+ at implementer(IErrorReportingUtility,
+             ILocalErrorReportingUtility,
+             zope.location.interfaces.IContained)
 class ErrorReportingUtility(Persistent):
     """Error Reporting Utility"""
-    implements(IErrorReportingUtility, ILocalErrorReportingUtility,
-               zope.location.interfaces.IContained)
 
     __parent__ = __name__ = None