Merge pull request #7 from plone/tomgross-removeunusedcode

Second try: "Merge tomgross-removeunusedcode"
plone · Mar 6, 2015 · efade1d · efade1d
2 parents b5892d2 + cd65405
commit efade1d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 49 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,7 +4,8 @@ Changelog
 2.0.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Removed unused testing code with dependency to PloneTestCase
+  [tomgross]
 
 
 2.0.3 (2015-02-11)

diff --git a/plone/openid/config.py b/plone/openid/config.py
@@ -1,9 +1,12 @@
+import pkg_resources
+
 try:
-    from openid.yadis import etxrd
-    HAS_OPENID=True
-except:
-    HAS_OPENID=False
+    pkg_resources.get_distribution('openid.yadis')
+except pkg_resources.DistributionNotFound:
+    HAS_OPENID = False
+else:
+    HAS_OPENID = True
 
 import socket
-HAS_SSL=hasattr(socket, "ssl")
+HAS_SSL = hasattr(socket, "ssl")
 del socket
diff --git a/plone/openid/tests/layer.py b/plone/openid/tests/layer.py
diff --git a/plone/openid/tests/oitestcase.py b/plone/openid/tests/oitestcase.py
diff --git a/setup.py b/setup.py
@@ -10,16 +10,18 @@
       classifiers=[
           "Environment :: Web Environment",
           "Framework :: Plone",
+          "Framework :: Plone :: 5.0",
           "Framework :: Zope2",
           "License :: OSI Approved :: BSD License",
           "Operating System :: OS Independent",
           "Programming Language :: Python",
+          "Programming Language :: Python :: 2.7",
           "Topic :: System :: Systems Administration :: Authentication/Directory",
         ],
       keywords='PAS openid authentication',
       author='Plone Foundation',
       author_email='plone-developers@lists.sourceforge.net',
-      url='http://svn.plone.org/svn/plone/plone.openid',
+      url='https://github.com/plone/plone.openid',
       license='BSD',
       packages=find_packages(exclude=['ez_setup']),
       namespace_packages=['plone'],