[Zope-Checkins] SVN: Zope/trunk/src/Products/__init__.py pkg_resources should be always available

[Baiju M]

Log message for revision 105031:
  pkg_resources should be always available
  (setuptools is a hard-dependency for Zope 2)
  

Changed:
  U   Zope/trunk/src/Products/__init__.py

-=-
Modified: Zope/trunk/src/Products/__init__.py
===================================================================
--- Zope/trunk/src/Products/__init__.py	2009-10-13 08:53:46 UTC (rev 105030)
+++ Zope/trunk/src/Products/__init__.py	2009-10-13 09:01:15 UTC (rev 105031)
@@ -11,8 +11,4 @@
 #
 ##############################################################################
 # See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)