From ce135e55c8c3a17554df1c9126d084295eaab1ae Mon Sep 17 00:00:00 2001
From: Mihail Stoyanov <wm@smode.org>
Date: Wed, 30 May 2018 12:00:19 +0100
Subject: [PATCH] Fix all izip leftover instances and improve tests

---
 .circleci/config.yml | 43 ++++++++++++++++++++++++++++++-------------
 mbed/mbed.py         |  8 ++++----
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 023f72b9..0ddee12c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,48 +42,65 @@ jobs:
       - run: cd .tests && mbed new supported-tests
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.6.0"
-          mbed update --clean "mbed-os-5.6.0"
+          echo "Testing mbed-os-5.8.5"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.8.5"
           mbed compile -S
+          mbed compile --config --prefix mbed
           mbed toolchain -S
           mbed target -S
           mbed export -S
+          mbed test --compile-list
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.5.0"
-          mbed update --clean "mbed-os-5.5.0"
+          echo "Testing mbed-os-5.7.6"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.7.5"
           mbed compile -S
           mbed toolchain -S
           mbed target -S
           mbed export -S
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.4.0"
-          mbed update --clean "mbed-os-5.4.0"
+          echo "Testing mbed-os-5.6.6"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.6.5"
           mbed compile -S
           mbed toolchain -S
           mbed target -S
-          mbed export -S 
+          mbed export -S
+      - run: |-
+          cd .tests/supported-tests
+          echo "Testing mbed-os-5.5.6"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.5.5"
+          mbed compile -S
+          mbed toolchain -S
+          mbed target -S
+          mbed export -S
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.3.0"
-          mbed update --clean "mbed-os-5.3.0"
+          echo "Testing mbed-os-5.4.6"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.4.5"
           mbed compile -S
           mbed toolchain -S
           mbed target -S
           mbed export -S
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.2.0"
-          mbed update --clean "mbed-os-5.2.0"
+          echo "Testing mbed-os-5.2.3"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.2.3"
           mbed compile -S
           mbed toolchain -S
           mbed target -S
           mbed export -S
       - run: |-
           cd .tests/supported-tests
-          echo "Testing mbed-os-5.1.0"
-          mbed update --clean "mbed-os-5.1.0"
+          echo "Testing mbed-os-5.1.5"
+          cd mbed-os
+          mbed update --clean --clean-files "mbed-os-5.1.5"
           mbed compile -S
           mbed toolchain -S
           mbed target -S
diff --git a/mbed/mbed.py b/mbed/mbed.py
index 6c32db44..4df0f701 100755
--- a/mbed/mbed.py
+++ b/mbed/mbed.py
@@ -2481,7 +2481,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
               + list(chain.from_iterable(zip(repeat('--profile'), profile or [])))
               + list(chain.from_iterable(zip(repeat('--source'), source)))
               + (['-v'] if verbose else [])
-              + (list(chain.from_iterable(izip(repeat('--prefix'), config_prefix))) if config_prefix else []),
+              + (list(chain.from_iterable(zip(repeat('--prefix'), config_prefix))) if config_prefix else []),
               env=env)
     else:
         # If the user hasn't supplied a build directory, ignore the default build directory
@@ -2602,7 +2602,7 @@ def test_(toolchain=None, target=None, compile_list=False, run_list=False, compi
 
         if compile_list:
             popen([python_cmd, '-u', os.path.join(tools_dir, 'test.py'), '--list']
-                  + list(chain.from_iterable(list(izip(repeat('--profile'), profile or []))))
+                  + list(chain.from_iterable(list(zip(repeat('--profile'), profile or []))))
                   + ['-t', tchain, '-m', target]
                   + list(chain.from_iterable(zip(repeat('--source'), source)))
                   + (['-n', tests_by_name] if tests_by_name else [])
@@ -2693,11 +2693,11 @@ def export(ide=None, target=None, source=False, clean=False, supported=False, ap
     program.ignore_build_dir()
 
     popen([python_cmd, '-u', os.path.join(tools_dir, 'project.py')]
-          + list(chain.from_iterable(izip(repeat('-D'), macros)))
+          + list(chain.from_iterable(zip(repeat('-D'), macros)))
           + ['-i', ide.lower()]
           + ['-m', target]
           + (['-c'] if clean else [])
-          + list(chain.from_iterable(izip(repeat('--source'), source)))
+          + list(chain.from_iterable(zip(repeat('--source'), source)))
           + (['--app-config', app_config] if app_config else [])
           + args,
           env=env)