Fix get_loader().load() from local couldn't get version correctly

When version is None, it wrongly tried to get version from file name
instead of file path.

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fix LocalLoader couldn't get right version if the argument version of load() is None.
+
 ## [v2.1.0] - 2019-10-23
 
 ### Fixed

setup.py

@@ -21,7 +21,7 @@ def get_requirements():
 
 setup(
     name="ubi-config",
-    version="2.1.0",
+    version="2.1.1",
     author="",
     author_email="",
     packages=find_packages(exclude=["tests", "tests.*"]),

ubiconfig/_impl/loaders/local.py

@@ -40,16 +40,16 @@ def load(self, file_name, version=None):
 
                 If version is None, we should get it from its path.
         """
-        if version is None:
-            # get version form path, such as configs/ubi7.1/config.yaml, get
-            # ubi7.1
-            version = os.path.basename(os.path.dirname(file_name))
-
         if not self._isroot:
             file_path = os.path.join(self._path, file_name)
         else:
             file_path = file_name
 
+        if version is None:
+            # get version from path, such as configs/ubi7.1/config.yaml, get
+            # ubi7.1
+            version = os.path.basename(os.path.dirname(file_path))
+
         LOG.info("Loading configuration file locally: %s", file_path)
 
         with open(file_path, "r") as f: