Remove namespace package boilerplate from google.protobuf and google.…

…protobuf.pyext. setup.py does not declare these packages to be namespace packages, so they shouldn't have the boilerplate. Fixes protocolbuffers#5194.
benjaminp · Nov 4, 2019 · d6c4df0 · d6c4df0
1 parent f6eeb43
commit d6c4df0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
@@ -31,9 +31,3 @@
 # Copyright 2007 Google Inc. All Rights Reserved.
 
 __version__ = '3.11.0rc0'
-
-if __name__ != '__main__':
-  try:
-    __import__('pkg_resources').declare_namespace(__name__)
-  except ImportError:
-    __path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/python/google/protobuf/pyext/__init__.py b/python/google/protobuf/pyext/__init__.py
@@ -1,4 +0,0 @@
-try:
-  __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-  __path__ = __import__('pkgutil').extend_path(__path__, __name__)