diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-08-01 22:17:36 +0000 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-08-01 22:17:36 +0000 |
| commit | da4f2d36bd4325c3dadf214f78f6975d304d0fb3 (patch) | |
| tree | a59f0b9620389ebb642366debccffc2cd0455d79 | |
| parent | 69365cb5ab109ed2305e46de9400ac04efac8435 (diff) | |
| download | nanopb-c-da4f2d36bd4325c3dadf214f78f6975d304d0fb3.tar.gz | |
Revert "Remove namespace package init script."
This reverts commit 69365cb5ab109ed2305e46de9400ac04efac8435.
Reason for revert: topic broke the build
Bug: 111798740
Change-Id: Ibd6c8423ac28679e986f6c53fc832a40bac56e41
| -rw-r--r-- | generator/google/protobuf/__init__.py | 5 | ||||
| -rw-r--r-- | patches/__init__.py.patch | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/generator/google/protobuf/__init__.py b/generator/google/protobuf/__init__.py index 82be65c..6210a40 100644 --- a/generator/google/protobuf/__init__.py +++ b/generator/google/protobuf/__init__.py @@ -32,3 +32,8 @@ __version__ = '3.0.0' +if __name__ != '__main__': + try: + __import__('pkg_resources').declare_namespace(__name__) + except ImportError: + __path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/patches/__init__.py.patch b/patches/__init__.py.patch deleted file mode 100644 index a49b52b..0000000 --- a/patches/__init__.py.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/generator/google/protobuf/__init__.py b/generator/google/protobuf/__init__.py -index 6210a40..82be65c 100644 ---- a/generator/google/protobuf/__init__.py -+++ b/generator/google/protobuf/__init__.py -@@ -32,8 +32,3 @@ - - __version__ = '3.0.0' - --if __name__ != '__main__': -- try: -- __import__('pkg_resources').declare_namespace(__name__) -- except ImportError: -- __path__ = __import__('pkgutil').extend_path(__path__, __name__) --- -2.18.0.345.g5c9ce644c3-goog - |