Merge branch 'master' into master

Author: theotherjimmy

azure-pipelines.yml

@@ -65,7 +65,7 @@ jobs:
                 displayName: 'Install mbed-os test dependencies'
             -
                 script: |
-                    pip install --user flake8
+                    pip install --user flake8==3.7.3
                     python -m flake8
                 condition: eq(variables['extraActions'], 'true')
                 displayName: 'Enforce code style'

src/mbed_os_tools/detect/lstools_base.py

@@ -398,9 +398,9 @@ def mock_manufacture_id(self, mid, platform_name, oper="+"):
                     '-' remove mid from mocking entry
         @return Mocked structure (json format)
         """
-        if oper is "+":
+        if oper == "+":
             self.plat_db.add(mid, platform_name, permanent=True)
-        elif oper is "-":
+        elif oper == "-":
             self.plat_db.remove(mid, permanent=True)
         else:
             raise ValueError("oper can only be [+-]")

src/mbed_os_tools/detect/platform_database.py

@@ -515,7 +515,7 @@ def remove(self, id, permanent=False, device_type="daplink", verbose_data=False)
         as a dict.
         """
         logger.debug("Trying remove of %s", id)
-        if id is "*" and device_type in self._dbs[self._prim_db]:
+        if id == "*" and device_type in self._dbs[self._prim_db]:
             self._dbs[self._prim_db][device_type] = {}
             if permanent:
                 self._update_db()