diff options
author | Mitch Garnaat <mitch@garnaat.com> | 2012-03-28 07:11:13 -0700 |
---|---|---|
committer | Mitch Garnaat <mitch@garnaat.com> | 2012-03-28 07:11:13 -0700 |
commit | 4f2c222d289c4c16cb21d39a79b5e93aa133a58c (patch) | |
tree | 9d44ba7daf726e8ba21e261ca75789d199920bc4 | |
parent | f672cbc189f851b4854078296440e6291767de9c (diff) | |
download | boto-4f2c222d289c4c16cb21d39a79b5e93aa133a58c.tar.gz |
Accomodating the moving of config.py from pyami to base dir.
-rw-r--r-- | boto/__init__.py | 4 | ||||
-rw-r--r-- | boto/auth_handler.py | 2 | ||||
-rwxr-xr-x | boto/storage_uri.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/boto/__init__.py b/boto/__init__.py index 6818635d..edc08444 100644 --- a/boto/__init__.py +++ b/boto/__init__.py @@ -23,8 +23,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. # -from boto.pyami.config import Config, BotoConfigLocations -from boto.storage_uri import BucketStorageUri, FileStorageUri +from .config import Config, BotoConfigLocations +from .storage_uri import BucketStorageUri, FileStorageUri import boto.plugin import os, re, sys import logging diff --git a/boto/auth_handler.py b/boto/auth_handler.py index 7ee8fa41..6dd16256 100644 --- a/boto/auth_handler.py +++ b/boto/auth_handler.py @@ -42,7 +42,7 @@ class AuthHandler(Plugin): :type host: string :param host: The host to which the request is being sent. - :type config: boto.pyami.Config + :type config: boto.Config :param config: Boto configuration. :type provider: boto.provider.Provider diff --git a/boto/storage_uri.py b/boto/storage_uri.py index 7b7a62c9..a1740329 100755 --- a/boto/storage_uri.py +++ b/boto/storage_uri.py @@ -74,7 +74,7 @@ class StorageUri(object): """ Opens a connection to appropriate provider, depending on provider portion of URI. Requires Credentials defined in boto config file (see - boto/pyami/config.py). + boto/config.py). @type storage_uri: StorageUri @param storage_uri: StorageUri specifying a bucket or a bucket+object @rtype: L{AWSAuthConnection<boto.gs.connection.AWSAuthConnection>} |