diff options
| author | Joffrey F <joffrey@docker.com> | 2015-09-15 00:00:06 +0200 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-09-16 12:55:13 -0700 |
| commit | acd5e634ffa62428562c945878dcb67edd6ecf61 (patch) | |
| tree | bdebbbd0de22c9ef72c542df496ddd4a73681ed7 /docker/api/image.py | |
| parent | ba6df5a2c09da68fe594e07dc2a62cabbe6667d7 (diff) | |
| download | docker-py-acd5e634ffa62428562c945878dcb67edd6ecf61.tar.gz | |
Generic skip decorator for low API version accessible to all tests
Add simpler version comparison functions
Add decorator to enforce minimum version in API methods
Fix utils imports
Add minimum_version decorators on API methods that needed it
GroupAdd test requires API version >= 1.20
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api/image.py')
| -rw-r--r-- | docker/api/image.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docker/api/image.py b/docker/api/image.py index c6939ef..f891e21 100644 --- a/docker/api/image.py +++ b/docker/api/image.py @@ -4,7 +4,7 @@ import warnings from ..auth import auth from ..constants import INSECURE_REGISTRY_DEPRECATION_WARNING -from ..utils import utils, check_resource +from .. import utils from .. import errors log = logging.getLogger(__name__) @@ -12,13 +12,13 @@ log = logging.getLogger(__name__) class ImageApiMixin(object): - @check_resource + @utils.check_resource def get_image(self, image): res = self._get(self._url("/images/{0}/get", image), stream=True) self._raise_for_status(res) return res.raw - @check_resource + @utils.check_resource def history(self, image): res = self._get(self._url("/images/{0}/history", image)) return self._result(res, True) @@ -124,7 +124,7 @@ class ImageApiMixin(object): return self._result( self._post(u, data=None, params=params)) - @check_resource + @utils.check_resource def insert(self, image, url, path): if utils.compare_version('1.12', self._version) >= 0: raise errors.DeprecatedMethod( @@ -137,7 +137,7 @@ class ImageApiMixin(object): } return self._result(self._post(api_url, params=params)) - @check_resource + @utils.check_resource def inspect_image(self, image): return self._result( self._get(self._url("/images/{0}/json", image)), True @@ -246,7 +246,7 @@ class ImageApiMixin(object): return self._result(response) - @check_resource + @utils.check_resource def remove_image(self, image, force=False, noprune=False): params = {'force': force, 'noprune': noprune} res = self._delete(self._url("/images/{0}", image), params=params) @@ -258,7 +258,7 @@ class ImageApiMixin(object): True ) - @check_resource + @utils.check_resource def tag(self, image, repository, tag=None, force=False): params = { 'tag': tag, |