From 9e3fd2fa437e2f3dab220a96fbe22ec5b250421d Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Thu, 6 Apr 2017 01:34:39 -0400
Subject: [PATCH 1/1] 11308: Make imports epydoc-parseable.

---
 doc/Rakefile                   | 3 ++-
 sdk/python/arvados/__init__.py | 8 ++++----
 sdk/python/arvados/stream.py   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/Rakefile b/doc/Rakefile
index 811ca67c2c..ab5a2ea5e2 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -15,7 +15,8 @@ end
 file "sdk/python/arvados/index.html" do |t|
   `which epydoc`
   if $? == 0
-    `epydoc --html --parse-only -o sdk/python/arvados ../sdk/python/arvados/`
+    STDERR.puts `epydoc --html --parse-only -o sdk/python/arvados ../sdk/python/arvados/ 2>&1`
+    raise if $? != 0
   else
     puts "Warning: epydoc not found, Python documentation will not be generated".colorize(:light_red)
   end
diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index c018d566cb..b2873ecc5b 100644
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -29,12 +29,12 @@ else:
 
 from .api import api, api_from_config, http_cache
 from .collection import CollectionReader, CollectionWriter, ResumableCollectionWriter
-from .keep import *
-from .stream import *
+from arvados.keep import *
+from arvados.stream import *
 from .arvfile import StreamFileReader
 from .retry import RetryLoop
-from . import errors
-from . import util
+import arvados.errors as errors
+import arvados.util as util
 
 # Set up Arvados logging based on the user's configuration.
 # All Arvados code should log under the arvados hierarchy.
diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index 1fe5d35f7e..b68685e374 100644
--- a/sdk/python/arvados/stream.py
+++ b/sdk/python/arvados/stream.py
@@ -12,7 +12,7 @@ import copy
 from ._ranges import locators_and_ranges, Range
 from .arvfile import StreamFileReader
 from arvados.retry import retry_method
-from .keep import *
+from arvados.keep import *
 from . import config
 from . import errors
 from ._normalize_stream import normalize_stream
-- 
2.30.2