diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2015-09-10 08:58:25 -0700 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2015-09-10 08:58:25 -0700 |
| commit | 43b2910f4daab65aab54a6685f1afb5adc983cd1 (patch) | |
| tree | aa6d43e9bb9bcaf43a691a68e94ac035547158cb | |
| parent | 83631772295417696b612c604303abbe36316d00 (diff) | |
| parent | 38fc0bb3d591246b527d52ec19583a833ab84f8b (diff) | |
Merge pull request #3315 from soltanmm/release
Fix Python docgen.
| -rw-r--r-- | src/python/grpcio/commands.py | 2 | ||||
| -rwxr-xr-x | tools/distrib/python/docgen.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index 89c0fbf0f3..8a2f2d6283 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -64,7 +64,7 @@ class SphinxDocumentation(setuptools.Command): import sphinx.apidoc metadata = self.distribution.metadata src_dir = os.path.join( - os.getcwd(), self.distribution.package_dir['grpc']) + os.getcwd(), self.distribution.package_dir[''], 'grpc') sys.path.append(src_dir) sphinx.apidoc.main([ '', '--force', '--full', '-H', metadata.name, '-A', metadata.author, diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py index d76792c56f..2acd3cc12f 100755 --- a/tools/distrib/python/docgen.py +++ b/tools/distrib/python/docgen.py @@ -81,7 +81,7 @@ if args.submit: assert args.doc_branch github_user = args.gh_user github_repository_owner = ( - args.gh_repo_owner if args.gh_repo_owner else gh_user) + args.gh_repo_owner if args.gh_repo_owner else args.gh_user) # Create a temporary directory out of tree, checkout gh-pages from the # specified repository, edit it, and push it. It's up to the user to then go # onto GitHub and make a PR against grpc/grpc:gh-pages. |