01-fix-detect-api-version.patch 816 B

12345678910111213141516171819202122
  1. --- contrib/python/docker/docker/api/client.py (index)
  2. +++ contrib/python/docker/docker/api/client.py (working tree)
  3. @@ -8,6 +8,7 @@ import six
  4. from .. import auth
  5. from ..constants import (
  6. + DEFAULT_DOCKER_API_VERSION,
  7. DEFAULT_MAX_POOL_SIZE,
  8. DEFAULT_NUM_POOLS,
  9. DEFAULT_NUM_POOLS_SSH,
  10. @@ -194,7 +194,10 @@ class APIClient(
  11. version,
  12. str
  13. ) and version.lower() == 'auto'):
  14. - self._version = self._retrieve_server_version()
  15. + try:
  16. + self._version = self._retrieve_server_version()
  17. + except:
  18. + self._version = DEFAULT_DOCKER_API_VERSION
  19. else:
  20. self._version = version
  21. if not isinstance(self._version, str):