docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from aanand/relative-errors-imports 

Relative 'errors' imports, for consistency
This commit is contained in:
Joffrey F 2014-04-23 19:54:46 +02:00
parent 6c1f7f3e97 918ca7dddb
commit 73434476b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/auth/auth.py
View File

@ -20,7 +20,7 @@ import os
import six import six
from ..utils import utils from ..utils import utils
from docker import errors from .. import errors
INDEX_URL = 'https://index.docker.io/v1/' INDEX_URL = 'https://index.docker.io/v1/'
DOCKER_CONFIG_FILENAME = '.dockercfg' DOCKER_CONFIG_FILENAME = '.dockercfg'

2
docker/client.py
View File

@ -24,7 +24,7 @@ import six
from .auth import auth from .auth import auth
from .unixconn import unixconn from .unixconn import unixconn
from .utils import utils from .utils import utils
from docker import errors from . import errors
if not six.PY3: if not six.PY3:
import websocket import websocket