Merge pull request #678 from screamerbg/development

Fix future python module dependency

Author: screamerbg

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
 
       - run: python --version
       - run: pip --version
-      - run: pip install pytest future
+      - run: pip install pytest
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "mbed Test"
       - run: echo -e "[ui]\nusername = mbed Test <[email protected]>\n" > ~/.hgrc
@@ -100,7 +100,7 @@ jobs:
 
       - run: python --version
       - run: pip --version
-      - run: pip install pytest future
+      - run: pip install pytest
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "mbed Test"
       - run: echo -e "[ui]\nusername = mbed Test <[email protected]>\n" > ~/.hgrc

mbed/mbed.py

@@ -19,16 +19,18 @@
 # pylint: disable=invalid-name, missing-docstring, bad-continuation
 
 from __future__ import print_function
-from future.builtins.iterators import zip
-from past.builtins import basestring
 
 try:
-  from urllib.parse import urlparse, quote
-  from urllib.request  import urlopen
-except ImportError:
-  from urlparse import urlparse
-  from urllib2 import urlopen
-  from urllib import quote
+    # Python 2
+    basestring = (unicode, str)
+    from urlparse import urlparse
+    from urllib2 import urlopen
+    from urllib import quote
+except NameError:
+    # Python 3
+    basestring = str
+    from urllib.parse import urlparse, quote
+    from urllib.request  import urlopen
 
 import traceback
 import sys
@@ -47,7 +49,7 @@
 
 
 # Application version
-ver = '1.7.0'
+ver = '1.7.1'
 
 # Default paths to Mercurial and Git
 hg_cmd = 'hg'

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name="mbed-cli",
-    version="1.7.0",
+    version="1.7.1",
     description="Arm Mbed command line tool for repositories version control, publishing and updating code from remotely hosted repositories (GitHub, GitLab and mbed.com), and invoking Mbed OS own build system and export functions, among other operations",
     long_description=LONG_DESC,
     url='http://github.com/ARMmbed/mbed-cli',