Return current context instead of default on get_context with no name

Signed-off-by: Anca Iordache <anca.iordache@docker.com>
docker · Feb 3, 2020 · 10a9437 · 10a9437
1 parent 0125e06
commit 10a9437
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/docker/context/api.py b/docker/context/api.py
@@ -67,15 +67,15 @@ def create_context(
         return ctx
 
     @classmethod
-    def get_context(cls, name="default"):
+    def get_context(cls, name=None):
         """Retrieves a context object.
         Args:
             name (str): The name of the context
 
         Example:
 
         >>> from docker.context import ContextAPI
-        >>> ctx = ContextAPI..get_context(name='test')
+        >>> ctx = ContextAPI.get_context(name='test')
         >>> print(ctx.Metadata)
         {
             "Name": "test",
@@ -90,7 +90,9 @@ def get_context(cls, name="default"):
             }
         }
         """
-        if not name or name == "default":
+        if not name:
+            name = get_current_context_name()
+        if name == "default":
             return ContextAPI.DEFAULT_CONTEXT
         return Context.load_context(name)
 
@@ -127,8 +129,7 @@ def get_current_context(cls):
         Returns:
             (Context): current context object.
         """
-        name = get_current_context_name()
-        return ContextAPI.get_context(name)
+        return ContextAPI.get_context()
 
     @classmethod
     def set_current_context(cls, name="default"):

diff --git a/docker/context/context.py b/docker/context/context.py
@@ -58,16 +58,16 @@ def inspect(self):
 
     @classmethod
     def load_context(cls, name):
-        name, orchestrator, endpoints = Context.load_meta(name)
+        name, orchestrator, endpoints = Context._load_meta(name)
         if name:
             instance = cls(name, orchestrator, endpoints=endpoints)
-            instance.load_certs()
+            instance._load_certs()
             instance.meta_path = get_meta_dir(name)
             return instance
         return None
 
     @classmethod
-    def load_meta(cls, name):
+    def _load_meta(cls, name):
         metadata = {}
         meta_file = get_meta_file(name)
         if os.path.isfile(meta_file):
@@ -88,7 +88,7 @@ def load_meta(cls, name):
                 metadata["Endpoints"])
         return None, None, None
 
-    def load_certs(self):
+    def _load_certs(self):
         certs = {}
         tls_dir = get_tls_dir(self.name)
         for endpoint in self.endpoints.keys():