get_in_units fix

chrisjsewell · Jun 18, 2019 · 3ac6230 · 3ac6230
1 parent c3a7a88
commit 3ac6230
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,8 +1,8 @@
 {
     "editor.rulers": [80],
-    "python.unitTest.pyTestEnabled": true,
-    "python.unitTest.unittestEnabled": false,
-    "python.unitTest.nosetestsEnabled": false,
+    "python.testing.pyTestEnabled": true,
+    "python.testing.unittestEnabled": false,
+    "python.testing.nosetestsEnabled": false,
     "python.pythonPath": "/anaconda/envs/lsr/bin/python",
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,

diff --git a/jsonextended/__init__.py b/jsonextended/__init__.py
@@ -93,6 +93,6 @@
 
 """
 
-__version__ = '0.7.10'
+__version__ = '0.7.11'
 
 from jsonextended import ejson, units, utils, edict, plugins  # noqa: F401
diff --git a/jsonextended/units/core.py b/jsonextended/units/core.py
@@ -15,9 +15,11 @@
 def get_in_units(value, units):
     """get a value in the required units """
     try:
-        return ureg.Quantity(value, units)
-    except NameError:
+        from pint import UnitRegistry
+        ureg = UnitRegistry()
+    except ImportError:
         raise ImportError('please install pint to use this module')
+    return ureg.Quantity(value, units)
 
 
 def apply_unitschema(data, uschema, as_quantity=True,