Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
786f80fe
Commit
786f80fe
authored
9 years ago
by
Silviu Calinoiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a modified patch from craigcitro@ to handle namespace sharing.
parent
c003abb4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
+14
-2
__init__.py
python/google/__init__.py
+4
-1
__init__.py
python/google/protobuf/__init__.py
+6
-0
__init__.py
python/google/protobuf/pyext/__init__.py
+4
-0
setup.py
python/setup.py
+0
-1
No files found.
python/google/__init__.py
View file @
786f80fe
__import__
(
'pkg_resources'
)
.
declare_namespace
(
__name__
)
try
:
__import__
(
'pkg_resources'
)
.
declare_namespace
(
__name__
)
except
ImportError
:
__path__
=
__import__
(
'pkgutil'
)
.
extend_path
(
__path__
,
__name__
)
This diff is collapsed.
Click to expand it.
python/google/protobuf/__init__.py
View file @
786f80fe
...
...
@@ -31,3 +31,9 @@
# Copyright 2007 Google Inc. All Rights Reserved.
__version__
=
'3.0.0b2'
if
__name__
!=
'__main__'
:
try
:
__import__
(
'pkg_resources'
)
.
declare_namespace
(
__name__
)
except
ImportError
:
__path__
=
__import__
(
'pkgutil'
)
.
extend_path
(
__path__
,
__name__
)
This diff is collapsed.
Click to expand it.
python/google/protobuf/pyext/__init__.py
View file @
786f80fe
try
:
__import__
(
'pkg_resources'
)
.
declare_namespace
(
__name__
)
except
ImportError
:
__path__
=
__import__
(
'pkgutil'
)
.
extend_path
(
__path__
,
__name__
)
This diff is collapsed.
Click to expand it.
python/setup.py
View file @
786f80fe
...
...
@@ -210,7 +210,6 @@ if __name__ == '__main__':
"Programming Language :: Python :: 3.3"
,
"Programming Language :: Python :: 3.4"
,
],
namespace_packages
=
[
'google'
],
packages
=
find_packages
(
exclude
=
[
'import_test_package'
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment