Merge pull request #182 from craigcitro/crypto_check

Simplify OpenSSL checks in crypt.py.
googleapis · May 18, 2015 · 418d5a6 · 418d5a6
2 parents e7340f3 + a687e96
commit 418d5a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/oauth2client/crypt.py b/oauth2client/crypt.py
@@ -39,9 +39,7 @@ class AppIdentityError(Exception):
 
 
 try:
-  _, _package_dir, _ = imp.find_module('OpenSSL')
-  if not os.path.isfile(os.path.join(_package_dir, 'crypto.py')):
-    raise ImportError('No module named OpenSSL')
+  _ = imp.find_module('OpenSSL')
 
   class OpenSSLVerifier(object):
     """Verifies the signature on a message."""

diff --git a/tests/test_crypt.py b/tests/test_crypt.py
@@ -58,15 +58,17 @@ def test_succeeds(self):
     self.assertTrue(pem_contents in [pkcs12_key_as_pem, alternate_pem])
 
   def test_without_openssl(self):
-    import os
-    path_isfile = os.path.isfile
+    import imp
+    imp_find_module = imp.find_module
+    def find_module(module_name):
+      raise ImportError('No module named %s' % module_name)
     try:
-      os.path.isfile = lambda value: False
+      imp.find_module = find_module
       reload(crypt)
       self.assertRaises(NotImplementedError, crypt.pkcs12_key_as_pem,
                         'FOO', 'BAR')
     finally:
-      os.path.isfile = path_isfile
+      imp.find_module = imp_find_module
       reload(crypt)
 
   def test_with_nonsense_key(self):