[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py Pass the ``encoding`` parameter only when using Python >= 2.5.

[Uli Fouquet]

Log message for revision 115079:
  Pass the ``encoding`` parameter only when using Python >= 2.5.
  

Changed:
  U   z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py

-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py	2010-07-25 14:24:57 UTC (rev 115078)
+++ z3c.testsetup/trunk/src/z3c/testsetup/functional/doctesting.py	2010-07-25 14:25:41 UTC (rev 115079)
@@ -14,6 +14,7 @@
 """Test setup helpers for functional doctests.
 """
 import doctest
+import sys
 import unittest
 import os.path
 from zope.testing import cleanup
@@ -97,12 +98,14 @@
             # We get absolute pathnames, but we need relative ones...
             common_prefix = os.path.commonprefix([self.package.__file__, name])
             name = name[len(common_prefix):]
+        if sys.version_info[:2] > (2,4): 
+            self.additional_options.update(
+                encoding = self.encoding)
         test = FunctionalDocFileSuite(
             name, package=self.package,
             setUp=self.setUp, tearDown=self.tearDown,
             globs=self.globs,
             optionflags=self.optionflags,
-            encoding=self.encoding,
             checker=self.checker,
             **self.additional_options
             )