remove io.open from getting version code (appium#334)

KazuCocoa · web-flow · commit e28713623765 · 2019-02-11T23:43:56.000+09:00
* remove io.open

* remove appium module from release script
diff --git a/appium/common/helper.py b/appium/common/helper.py
@@ -15,6 +15,8 @@
 import io
 import os
 
+from appium import version as appium_version
+
 
 def appium_bytes(value, encoding):
     """
@@ -41,9 +43,4 @@ def library_version():
     Return a version of this python library
     """
 
-    global_param = {}
-    exec(
-        io.open(os.path.join(os.path.dirname('__file__'), 'appium', 'version.py'), encoding='utf-8').read(),
-        global_param
-    )
-    return global_param['version']
+    return appium_version.version
diff --git a/script/release.py b/script/release.py
@@ -15,7 +15,7 @@
 
 import os
 import sys
-from appium.common.helper import library_version
+import io
 
 VERSION_FILE_PATH = os.path.join(os.path.dirname('__file__'), 'appium', 'version.py')
 CHANGELOG_PATH = os.path.join(os.path.dirname('__file__'), 'CHANGELOG.rst')
@@ -26,7 +26,8 @@
 
 
 def get_current_version():
-    current = library_version()
+    current = io.open(os.path.join(os.path.dirname('__file__'), 'appium',
+                                   'version.py'), encoding='utf-8').read().rstrip()
     print('The current version is {}, type a new one'.format(MESSAGE_YELLOW.format(current)))
     return current
 
diff --git a/test/unit/webdriver/webdriver_test.py b/test/unit/webdriver/webdriver_test.py
@@ -16,7 +16,7 @@
 import httpretty
 from appium import webdriver
 
-from appium.common.helper import library_version
+from appium import version as appium_version
 
 
 class TestWebDriverWebDriver(object):
@@ -44,7 +44,7 @@ def test_create_session(self):
 
         request = httpretty.HTTPretty.latest_requests[0]
         assert request.headers['content-type'] == 'application/json;charset=UTF-8'
-        assert 'appium/python {} (selenium'.format(library_version()) in request.headers['user-agent']
+        assert 'appium/python {} (selenium'.format(appium_version.version) in request.headers['user-agent']
 
         request_json = json.loads(httpretty.HTTPretty.latest_requests[0].body.decode('utf-8'))
         assert request_json.get('capabilities') is not None
@@ -77,7 +77,7 @@ def test_create_session_forceMjsonwp(self):
 
         request = httpretty.HTTPretty.latest_requests[0]
         assert request.headers['content-type'] == 'application/json;charset=UTF-8'
-        assert 'appium/python {} (selenium'.format(library_version()) in request.headers['user-agent']
+        assert 'appium/python {} (selenium'.format(appium_version.version) in request.headers['user-agent']
 
         request_json = json.loads(httpretty.HTTPretty.latest_requests[0].body.decode('utf-8'))
         assert request_json.get('capabilities') is None
