Merge pull request #16976 from benjaminp/remove-pkg_resources

Replace pkg_resources with pkgutil.

5 files changed, 27 insertions, 32 deletions

diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/security.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/security.pyx.pxi
index 7decae95bb..e17ca6d335 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/security.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/security.pyx.pxi
@@ -14,14 +14,16 @@
 
 from libc.string cimport memcpy
 
-import pkg_resources
+import pkgutil
 
 
 cdef grpc_ssl_roots_override_result ssl_roots_override_callback(
     char **pem_root_certs) nogil:
   with gil:
-    temporary_pem_root_certs = pkg_resources.resource_string(
-        __name__.rstrip('.cygrpc'), '_credentials/roots.pem')
+    pkg = __name__
+    if pkg.endswith('.cygrpc'):
+      pkg = pkg[:-len('.cygrpc')]
+    temporary_pem_root_certs = pkgutil.get_data(pkg, '_credentials/roots.pem')
     pem_root_certs[0] = <char *>gpr_malloc(len(temporary_pem_root_certs) + 1)
     memcpy(
         pem_root_certs[0], <char *>temporary_pem_root_certs,
diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/grpcio/grpc/_cython/cygrpc.pyx
index 026f7ba2e3..ae5c07bfc8 100644
--- a/src/python/grpcio/grpc/_cython/cygrpc.pyx
+++ b/src/python/grpcio/grpc/_cython/cygrpc.pyx
@@ -15,7 +15,6 @@
 
 cimport cpython
 
-import pkg_resources
 import os.path
 import sys
 
diff --git a/src/python/grpcio_tests/tests/_sanity/_sanity_test.py b/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
index b4079850ff..7da6e7b34c 100644
--- a/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
+++ b/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import json
+import pkgutil
 import unittest
 
-import pkg_resources
 import six
 
 import tests
@@ -35,7 +35,7 @@ class SanityTest(unittest.TestCase):
                 loader.suite)
         })
 
-        tests_json_string = pkg_resources.resource_string('tests', 'tests.json')
+        tests_json_string = pkgutil.get_data('tests', 'tests.json')
         tests_json = json.loads(tests_json_string.decode()
                                 if six.PY3 else tests_json_string)
 
diff --git a/src/python/grpcio_tests/tests/interop/resources.py b/src/python/grpcio_tests/tests/interop/resources.py
index 2f76cf5db6..a55919a60a 100644
--- a/src/python/grpcio_tests/tests/interop/resources.py
+++ b/src/python/grpcio_tests/tests/interop/resources.py
@@ -14,27 +14,24 @@
 """Constants and functions for data used in interoperability testing."""
 
 import argparse
+import pkgutil
 import os
 
-import pkg_resources
-
 _ROOT_CERTIFICATES_RESOURCE_PATH = 'credentials/ca.pem'
 _PRIVATE_KEY_RESOURCE_PATH = 'credentials/server1.key'
 _CERTIFICATE_CHAIN_RESOURCE_PATH = 'credentials/server1.pem'
 
 
 def test_root_certificates():
-    return pkg_resources.resource_string(__name__,
-                                         _ROOT_CERTIFICATES_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _ROOT_CERTIFICATES_RESOURCE_PATH)
 
 
 def private_key():
-    return pkg_resources.resource_string(__name__, _PRIVATE_KEY_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _PRIVATE_KEY_RESOURCE_PATH)
 
 
 def certificate_chain():
-    return pkg_resources.resource_string(__name__,
-                                         _CERTIFICATE_CHAIN_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _CERTIFICATE_CHAIN_RESOURCE_PATH)
 
 
 def parse_bool(value):
diff --git a/src/python/grpcio_tests/tests/unit/resources.py b/src/python/grpcio_tests/tests/unit/resources.py
index 51a8979f58..6efd870fc8 100644
--- a/src/python/grpcio_tests/tests/unit/resources.py
+++ b/src/python/grpcio_tests/tests/unit/resources.py
@@ -14,8 +14,7 @@
 """Constants and functions for data used in testing."""
 
 import os
-
-import pkg_resources
+import pkgutil
 
 _ROOT_CERTIFICATES_RESOURCE_PATH = 'credentials/ca.pem'
 _PRIVATE_KEY_RESOURCE_PATH = 'credentials/server1.key'
@@ -23,94 +22,92 @@ _CERTIFICATE_CHAIN_RESOURCE_PATH = 'credentials/server1.pem'
 
 
 def test_root_certificates():
-    return pkg_resources.resource_string(__name__,
-                                         _ROOT_CERTIFICATES_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _ROOT_CERTIFICATES_RESOURCE_PATH)
 
 
 def private_key():
-    return pkg_resources.resource_string(__name__, _PRIVATE_KEY_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _PRIVATE_KEY_RESOURCE_PATH)
 
 
 def certificate_chain():
-    return pkg_resources.resource_string(__name__,
-                                         _CERTIFICATE_CHAIN_RESOURCE_PATH)
+    return pkgutil.get_data(__name__, _CERTIFICATE_CHAIN_RESOURCE_PATH)
 
 
 def cert_hier_1_root_ca_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__, 'credentials/certificate_hierarchy_1/certs/ca.cert.pem')
 
 
 def cert_hier_1_intermediate_ca_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_1/intermediate/certs/intermediate.cert.pem'
     )
 
 
 def cert_hier_1_client_1_key():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_1/intermediate/private/client.key.pem'
     )
 
 
 def cert_hier_1_client_1_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_1/intermediate/certs/client.cert.pem'
     )
 
 
 def cert_hier_1_server_1_key():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_1/intermediate/private/localhost-1.key.pem'
     )
 
 
 def cert_hier_1_server_1_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_1/intermediate/certs/localhost-1.cert.pem'
     )
 
 
 def cert_hier_2_root_ca_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__, 'credentials/certificate_hierarchy_2/certs/ca.cert.pem')
 
 
 def cert_hier_2_intermediate_ca_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_2/intermediate/certs/intermediate.cert.pem'
     )
 
 
 def cert_hier_2_client_1_key():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_2/intermediate/private/client.key.pem'
     )
 
 
 def cert_hier_2_client_1_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_2/intermediate/certs/client.cert.pem'
     )
 
 
 def cert_hier_2_server_1_key():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_2/intermediate/private/localhost-1.key.pem'
     )
 
 
 def cert_hier_2_server_1_cert():
-    return pkg_resources.resource_string(
+    return pkgutil.get_data(
         __name__,
         'credentials/certificate_hierarchy_2/intermediate/certs/localhost-1.cert.pem'
     )