11308: Make imports epydoc-parseable.

diff --git a/doc/Rakefile b/doc/Rakefile
index 811ca67c2c09cca0efbaf7b23fb2200feae97a76..ab5a2ea5e2b12fba9bfb7bcf319248ecdf0d56fe 100644 (file)
--- 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 c018d566cb00108af958894533ceaba4987f166f..b2873ecc5b6c37ac3e57b21c2bc97640b1ca6243 100644 (file)
--- 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 1fe5d35f7ed0e8f63153b87971620de6b6378d0a..b68685e374d313d5337bbed80bbadd2e307ba7b5 100644 (file)
--- 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