[Checkins] SVN: zc.metarecipe/trunk/src/zc/metarecipe/ Reverted previous change. Decided to address the problem by making it

[jim]

Log message for revision 127880:
  Reverted previous change. Decided to address the problem by making it
  easier to do the right thing, rather than by catching doing the wrong
  thing.
  

Changed:
  U   zc.metarecipe/trunk/src/zc/metarecipe/README.txt
  U   zc.metarecipe/trunk/src/zc/metarecipe/testing.py
  U   zc.metarecipe/trunk/src/zc/metarecipe/tests.py

-=-
Modified: zc.metarecipe/trunk/src/zc/metarecipe/README.txt
===================================================================
--- zc.metarecipe/trunk/src/zc/metarecipe/README.txt	2012-09-24 16:00:59 UTC (rev 127879)
+++ zc.metarecipe/trunk/src/zc/metarecipe/README.txt	2012-09-24 16:07:41 UTC (rev 127880)
@@ -231,9 +231,6 @@
        way ConfigParser works.  Not sections are added to a buildout
        in sortd order, by section name.
 
-Fixed: Testing support didn't catch type errors resulting from using
-       non-string data (especially unicode) in recipe options.
-
 0.1.0 (2012-05-31)
 ------------------
 

Modified: zc.metarecipe/trunk/src/zc/metarecipe/testing.py
===================================================================
--- zc.metarecipe/trunk/src/zc/metarecipe/testing.py	2012-09-24 16:00:59 UTC (rev 127879)
+++ zc.metarecipe/trunk/src/zc/metarecipe/testing.py	2012-09-24 16:07:41 UTC (rev 127880)
@@ -8,7 +8,5 @@
     def __getitem__(self, name):
         print "[%s]" % name
         for k, v in sorted(self._raw[name].items()):
-            if not isinstance(v, str):
-                raise TypeError('Option values must be strings', v)
             print "%s = %s" % (k, v.replace("\n", "\n  ").strip())
         return self._raw[name]

Modified: zc.metarecipe/trunk/src/zc/metarecipe/tests.py
===================================================================
--- zc.metarecipe/trunk/src/zc/metarecipe/tests.py	2012-09-24 16:00:59 UTC (rev 127879)
+++ zc.metarecipe/trunk/src/zc/metarecipe/tests.py	2012-09-24 16:07:41 UTC (rev 127880)
@@ -12,42 +12,11 @@
 #
 ##############################################################################
 from zope.testing import setupstack
-import doctest
 import manuel.capture
 import manuel.doctest
 import manuel.testing
 import unittest
 
-def test_testing_error_on_unicode_and_other_types():
-    """
-    >>> import zc.metarecipe.testing
-    >>> buildout = zc.metarecipe.testing.Buildout()
-
-    Strings are cool:
-
-    >>> buildout._raw['x'] = dict(o='v')
-    >>> _ = buildout['x']
-    [x]
-    o = v
-
-    Unicode not so much:
-
-    >>> buildout._raw['x'] = dict(o=u'v')
-    >>> _ = buildout['x']
-    Traceback (most recent call last):
-    ...
-    TypeError: ('Option values must be strings', u'v')
-
-    Or other non strings:
-
-    >>> buildout._raw['x'] = dict(o=1)
-    >>> _ = buildout['x']
-    Traceback (most recent call last):
-    ...
-    TypeError: ('Option values must be strings', 1)
-
-    """
-
 def test_suite():
     return unittest.TestSuite((
         manuel.testing.TestSuite(
@@ -55,6 +24,5 @@
             'README.txt',
             setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown,
             ),
-        doctest.DocTestSuite(),
         ))