aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python/grpcio
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-06-29 13:50:32 -0700
committerGravatar GitHub <noreply@github.com>2016-06-29 13:50:32 -0700
commit01d7dbac1f747ca45135f1d79c38656db0701ec6 (patch)
tree674602fa02135a041c62ca7497af43148f0feca6 /src/python/grpcio
parent296340d4f136bd9a76f768f89dfd0107d6d8d70d (diff)
parent110601d8e1b225ccee3696e82ace070239ec3d5a (diff)
Merge pull request #7116 from kpayson64/python_windows_fix
Convert windows dll filename to bytes
Diffstat (limited to 'src/python/grpcio')
-rw-r--r--src/python/grpcio/grpc/_cython/cygrpc.pyx2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/grpcio/grpc/_cython/cygrpc.pyx
index c92a8d19a7..7a8d0dd8a1 100644
--- a/src/python/grpcio/grpc/_cython/cygrpc.pyx
+++ b/src/python/grpcio/grpc/_cython/cygrpc.pyx
@@ -53,6 +53,8 @@ def _initialize():
if 'win32' in sys.platform:
filename = pkg_resources.resource_filename(
'grpc._cython', '_windows/grpc_c.64.python')
+ if not isinstance(filename, bytes):
+ filename = filename.encode()
if not pygrpc_load_core(filename):
raise ImportError('failed to load core gRPC library')
if not pygrpc_initialize_core():