Experimenting with namespace package settings - following similar

strategy to Paste and using pkg_resources if available otherwise pkgutil

Author: philipkershaw

.gitignore

@@ -0,0 +1,2 @@
+/ndg_httpsclient.egg-info/
+/dist/

ndg/__init__.py

@@ -1,19 +1,11 @@
-"""ndg_httpsclient - PyOpenSSL utility to make a httplib-like interface suitable
-for use with urllib2
-
-This is a setuptools namespace_package.  DO NOT place any other
-code in this file!  There is no guarantee that it will be installed
-with easy_install.  See:
-
-http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-
-... for details.
-"""
-__author__ = "P J Kershaw"
-__date__ = "06/01/12"
-__copyright__ = "(C) 2012 Science and Technology Facilities Council"
-__license__ = "BSD - see LICENSE file in top-level directory"
-__contact__ = "[email protected]"
-__revision__ = '$Id$'
-
-__import__('pkg_resources').declare_namespace(__name__)
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    # don't prevent use if pkg_resources isn't installed
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__) 
+
+import modulefinder
+for p in __path__:
+    modulefinder.AddPackagePath(__name__, p)

ndg/httpsclient/ssl_peer_verification.py

@@ -41,7 +41,8 @@ class ServerSSLCertVerification(object):
         'userid':                   'UID'
     }
     SUBJ_ALT_NAME_EXT_NAME = 'subjectAltName'
-    PARSER_RE_STR = '/(%s)=' % '|'.join(list(DN_LUT.keys()) + list(DN_LUT.values()))
+    PARSER_RE_STR = '/(%s)=' % '|'.join(list(DN_LUT.keys()) + \
+                                        list(DN_LUT.values()))
     PARSER_RE = re.compile(PARSER_RE_STR)
 
     __slots__ = ('__hostname', '__certDN', '__subj_alt_name_match')

setup.py

@@ -5,6 +5,8 @@
     use_setuptools()
     from setuptools import setup, find_packages
 
+NAMESPACE_PKGS = ['ndg']
+
 _long_description = '''
 This is a HTTPS client implementation for httplib and urllib2 based on
 PyOpenSSL.  PyOpenSSL provides a more fully featured SSL implementation over the
@@ -102,17 +104,17 @@
 
 setup(
     name='ndg_httpsclient',
-    version="0.4.0",
+    version="0.4.1",
     description='Provides enhanced HTTPS support for httplib and urllib2 using '
                 'PyOpenSSL',
     author='Richard Wilkinson and Philip Kershaw',
     author_email='[email protected]',
     url='https://github.com/cedadev/ndg_httpsclient/',
     long_description=_long_description,
     license='BSD - See LICENCE file for details',
-    namespace_packages=['ndg'],
     packages=find_packages(),
-    package_dir={'ndg.httpsclient': 'ndg/httpsclient'},
+    namespace_packages=NAMESPACE_PKGS,
+#     package_dir={'ndg.httpsclient': 'ndg/httpsclient'},
     package_data={
         'ndg.httpsclient': [
             'test/README', 
@@ -121,9 +123,9 @@
             'test/pki/ca/*.0'
             ],
     },
-    install_requires = ['PyOpenSSL'],
-    extras_require = {'subjectAltName_support': 'pyasn1'},
-    classifiers = [
+    install_requires=['PyOpenSSL'],
+    extras_require={'subjectAltName_support': 'pyasn1'},
+    classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Console',
         'Environment :: Web Environment',
@@ -143,8 +145,8 @@
         'Topic :: System :: Systems Administration :: Authentication/Directory',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
-    zip_safe = False,
-    entry_points = {
+    zip_safe=False,
+    entry_points={
         'console_scripts': ['ndg_httpclient = ndg.httpsclient.utils:main',
                             ],
         }