[Checkins] SVN: Sandbox/shane/republish/zope.app.publisher/s The 'zope_3_4_compat' extra did not behave as expected. Better

Shane Hathaway shane at hathawaymix.org
Sun Feb 8 01:10:25 EST 2009


Log message for revision 96228:
  The 'zope_3_4_compat' extra did not behave as expected.  Better
  to just remove it.
  

Changed:
  U   Sandbox/shane/republish/zope.app.publisher/setup.py
  U   Sandbox/shane/republish/zope.app.publisher/src/zope/app/publisher/fieldconverters.py

-=-
Modified: Sandbox/shane/republish/zope.app.publisher/setup.py
===================================================================
--- Sandbox/shane/republish/zope.app.publisher/setup.py	2009-02-08 05:36:43 UTC (rev 96227)
+++ Sandbox/shane/republish/zope.app.publisher/setup.py	2009-02-08 06:10:24 UTC (rev 96228)
@@ -68,7 +68,6 @@
                    'zope.app.securitypolicy',
                    'zope.app.zcmlfiles',
                    'zope.site'],
-          'zope_3_4_compat': ['zope.httpformdate'],
           },
 
       zip_safe = False,

Modified: Sandbox/shane/republish/zope.app.publisher/src/zope/app/publisher/fieldconverters.py
===================================================================
--- Sandbox/shane/republish/zope.app.publisher/src/zope/app/publisher/fieldconverters.py	2009-02-08 05:36:43 UTC (rev 96227)
+++ Sandbox/shane/republish/zope.app.publisher/src/zope/app/publisher/fieldconverters.py	2009-02-08 06:10:24 UTC (rev 96228)
@@ -14,15 +14,6 @@
 """Stub to make old imports work.
 """
 
-import pkg_resources
-
-_dist_name = "zope.app.publisher"
-_extra = 'zope_3_4_compat'
-if _extra not in pkg_resources.get_distribution(_dist_name).extras:
-    raise ImportError("The module '%s' is not available unless "
-        "the %s egg is installed with the '%s' extra option."
-        % (__name__, _dist_name, _extra))
-
 from zope.deferredimport import deprecated
 
 deprecated("This function has moved to zope.httpformdate.",



More information about the Checkins mailing list