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

[Tres Seaver]

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

Changed:
  U   zope.applicationcontrol/trunk/CHANGES.txt
  U   zope.applicationcontrol/trunk/setup.py
  U   zope.applicationcontrol/trunk/src/zope/applicationcontrol/applicationcontrol.py
  U   zope.applicationcontrol/trunk/src/zope/applicationcontrol/runtimeinfo.py
  U   zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py

-=-
Modified: zope.applicationcontrol/trunk/CHANGES.txt
===================================================================
--- zope.applicationcontrol/trunk/CHANGES.txt	2012-05-18 04:04:22 UTC (rev 126049)
+++ zope.applicationcontrol/trunk/CHANGES.txt	2012-05-18 04:08:09 UTC (rev 126050)
@@ -2,12 +2,15 @@
 CHANGES
 =======
 
-3.5.6 (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.5.5 (2010-01-09)
 ------------------
 

Modified: zope.applicationcontrol/trunk/setup.py
===================================================================
--- zope.applicationcontrol/trunk/setup.py	2012-05-18 04:04:22 UTC (rev 126049)
+++ zope.applicationcontrol/trunk/setup.py	2012-05-18 04:08:09 UTC (rev 126050)
@@ -16,7 +16,7 @@
 # When developing and releasing this package, please follow the documented
 # Zope Toolkit policies as described by this documentation.
 ##############################################################################
-version = '3.5.6dev'
+version = '4.0.0dev'
 
 import os
 
@@ -43,6 +43,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.applicationcontrol/trunk/src/zope/applicationcontrol/applicationcontrol.py
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/applicationcontrol.py	2012-05-18 04:04:22 UTC (rev 126049)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/applicationcontrol.py	2012-05-18 04:08:09 UTC (rev 126050)
@@ -22,9 +22,9 @@
 from zope.security.checker import ProxyFactory, NamesChecker
 from zope.applicationcontrol.interfaces import IApplicationControl
 
+ at zope.interface.implementer(IApplicationControl)
 class ApplicationControl(Location):
 
-    zope.interface.implements(IApplicationControl)
 
     def __init__(self):
         self.start_time = time.time()

Modified: zope.applicationcontrol/trunk/src/zope/applicationcontrol/runtimeinfo.py
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/runtimeinfo.py	2012-05-18 04:04:22 UTC (rev 126049)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/runtimeinfo.py	2012-05-18 04:08:09 UTC (rev 126050)
@@ -27,7 +27,7 @@
 import platform
 
 from zope.component import getUtility, ComponentLookupError
-from zope.interface import implements
+from zope.interface import implementer
 
 from zope.applicationcontrol.interfaces import IRuntimeInfo
 from zope.applicationcontrol.interfaces import IApplicationControl
@@ -39,10 +39,10 @@
     appsetup = None
 
 
+ at implementer(IRuntimeInfo)
 class RuntimeInfo(object):
     """Runtime information."""
 
-    implements(IRuntimeInfo)
     __used_for__ = IApplicationControl
 
     def __init__(self, context):

Modified: zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py	2012-05-18 04:04:22 UTC (rev 126049)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py	2012-05-18 04:08:09 UTC (rev 126050)
@@ -21,7 +21,7 @@
     locale = None
 
 from zope import component
-from zope.interface import implements
+from zope.interface import implementer
 from zope.interface.verify import verifyObject
 from zope.applicationcontrol.applicationcontrol import applicationController
 from zope.applicationcontrol.interfaces import IRuntimeInfo, IZopeVersion
@@ -30,14 +30,14 @@
 time_tolerance = 2
 stupid_version_string = "3085t0klvn93850voids"
 
+ at implementer(IZopeVersion)
 class TestZopeVersion(object):
     """A fallback implementation for the ZopeVersion utility."""
 
-    implements(IZopeVersion)
-
     def getZopeVersion(self):
         return stupid_version_string
 
+
 class Test(unittest.TestCase):
 
     def _Test__new(self):