[Checkins] SVN: z3c.reload/trunk/ - Updated to run with Python 2.6.

[Michael Howitz]

Log message for revision 117078:
  - Updated to run with Python 2.6.
  
  - Added missing test depenencies.
  
  - Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest``.
  

Changed:
  U   z3c.reload/trunk/CHANGES.txt
  U   z3c.reload/trunk/setup.py
  U   z3c.reload/trunk/src/z3c/reload/reload.py
  U   z3c.reload/trunk/src/z3c/reload/tests/application.zcml
  U   z3c.reload/trunk/src/z3c/reload/tests/tests.py

-=-
Modified: z3c.reload/trunk/CHANGES.txt
===================================================================
--- z3c.reload/trunk/CHANGES.txt	2010-09-30 00:58:52 UTC (rev 117077)
+++ z3c.reload/trunk/CHANGES.txt	2010-09-30 06:30:43 UTC (rev 117078)
@@ -2,7 +2,19 @@
 CHANGES
 =======
 
-Version 0.1.0 (2008-08-??)
---------------------------
+0.1.1 (unreleased)
+------------------
 
+- Updated to run with Python 2.6.
+
+- Added missing test depenencies.
+
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+
+
+0.1.0 (2008-08-??)
+------------------
+
 - Initial Release

Modified: z3c.reload/trunk/setup.py
===================================================================
--- z3c.reload/trunk/setup.py	2010-09-30 00:58:52 UTC (rev 117077)
+++ z3c.reload/trunk/setup.py	2010-09-30 06:30:43 UTC (rev 117078)
@@ -58,6 +58,12 @@
                 'zope.securitypolicy',
                 'zope.app.testing',
                 'zope.app.twisted',
+                'zope.app.component',
+                'zope.app.form',
+                'zope.app.security',
+                'zope.app.folder',
+                'zope.app.zcmlfiles',
+                'zope.app.session',
                 'z3c.coverage',
                 'zc.configuration'],
         ),

Modified: z3c.reload/trunk/src/z3c/reload/reload.py
===================================================================
--- z3c.reload/trunk/src/z3c/reload/reload.py	2010-09-30 00:58:52 UTC (rev 117077)
+++ z3c.reload/trunk/src/z3c/reload/reload.py	2010-09-30 06:30:43 UTC (rev 117078)
@@ -49,7 +49,11 @@
         # This is generally not the right thing to do, but should work in this
         # limited case.
         for base in self.__class__.__bases__[1:]:
-            base.__init__(self, *args, **kw)
+            try:
+                base.__init__(self, *args, **kw)
+            except TypeError:
+                # Needed as object.__init__() does not accept any arguments in py26.
+                base.__init__(self)
 
     def __sanitize_bases(self, cls):
         """Make sure that the bases of a class are in the scope.

Modified: z3c.reload/trunk/src/z3c/reload/tests/application.zcml
===================================================================
--- z3c.reload/trunk/src/z3c/reload/tests/application.zcml	2010-09-30 00:58:52 UTC (rev 117077)
+++ z3c.reload/trunk/src/z3c/reload/tests/application.zcml	2010-09-30 06:30:43 UTC (rev 117078)
@@ -4,7 +4,6 @@
     i18n_domain="demo">
 
   <include package="zope.app.component" file="meta.zcml" />
-  <include package="zope.app.component.browser" file="meta.zcml" />
   <include package="zope.app.form.browser" file="meta.zcml" />
   <include package="zope.app.pagetemplate" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />

Modified: z3c.reload/trunk/src/z3c/reload/tests/tests.py
===================================================================
--- z3c.reload/trunk/src/z3c/reload/tests/tests.py	2010-09-30 00:58:52 UTC (rev 117077)
+++ z3c.reload/trunk/src/z3c/reload/tests/tests.py	2010-09-30 06:30:43 UTC (rev 117078)
@@ -15,10 +15,10 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
+from zope.app.testing import functional
+import doctest
 import os
 import unittest
-from zope.testing import doctest
-from zope.app.testing import functional
 
 ReloadLayer = functional.ZCMLLayer(
     os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),