Permalink
Browse files

Accomodating the moving of config.py from pyami to base dir.

  • Loading branch information...
garnaat committed Mar 28, 2012
1 parent f672cbc commit 4f2c222d289c4c16cb21d39a79b5e93aa133a58c
Showing with 4 additions and 4 deletions.
  1. +2 −2 boto/__init__.py
  2. +1 −1 boto/auth_handler.py
  3. +1 −1 boto/storage_uri.py
View
@@ -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
View
@@ -42,7 +42,7 @@ def __init__(self, host, config, provider):
: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
View
@@ -74,7 +74,7 @@ def connect(self, access_key_id=None, secret_access_key=None, **kwargs):
"""
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>}

0 comments on commit 4f2c222

Please sign in to comment.