From c0a4b0dba484bec3c4e97a52b4f69bd62061f3ad Mon Sep 17 00:00:00 2001
From: bmc-msft <41130664+bmc-msft@users.noreply.github.com>
Date: Fri, 22 Jan 2021 14:00:35 -0500
Subject: [PATCH] remove workaround for an issue addressed in latest mypy
 (#455)

---
 .github/workflows/ci.yml               |  2 +-
 src/pytypes/onefuzztypes/primitives.py | 22 +++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de99e6059..a315eb30b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,7 +106,7 @@ jobs:
         isort --profile black ./onefuzz ./examples/ ./tests/ --check
         pytest -v tests
         ../ci/disable-py-cache.sh
-        mypy . --ignore-missing-imports
+        mypy --ignore-missing-imports ./onefuzz ./examples ./tests
 
         # set a minimum confidence to ignore known false positives
         vulture --min-confidence 61 onefuzz
diff --git a/src/pytypes/onefuzztypes/primitives.py b/src/pytypes/onefuzztypes/primitives.py
index bd7d61621..06063cc38 100644
--- a/src/pytypes/onefuzztypes/primitives.py
+++ b/src/pytypes/onefuzztypes/primitives.py
@@ -4,7 +4,7 @@
 # Licensed under the MIT License.
 
 from enum import Enum
-from typing import Any, Dict, NewType, Union, cast
+from typing import Any, Dict, NewType, Union
 from uuid import UUID
 
 from onefuzztypes.validators import check_alnum, check_alnum_dash
@@ -15,30 +15,22 @@ Directory = NewType("Directory", str)
 File = NewType("File", str)
 
 
-# We ignore typing for the following super().__new__ calls
-# specifically because mypy does not handle subclassing
-# builtins well.  As is, mypy generates the error
-# 'Too many arguments for "__new__" of "object"'
-#
-# However, this works in practice.
-
-
 class Region(str):
     def __new__(cls, value: str) -> "Region":
         check_alnum(value)
-        obj = super().__new__(cls, value)  # type: ignore
-        return cast(Region, obj)
+        obj = super().__new__(cls, value)
+        return obj
 
 
 class Container(str):
     def __new__(cls, value: str) -> "Container":
         check_alnum_dash(value)
-        obj = super().__new__(cls, value)  # type: ignore
-        return cast(Container, obj)
+        obj = super().__new__(cls, value)
+        return obj
 
 
 class PoolName(str):
     def __new__(cls, value: str) -> "PoolName":
         check_alnum_dash(value)
-        obj = super().__new__(cls, value)  # type: ignore
-        return cast(PoolName, obj)
+        obj = super().__new__(cls, value)
+        return obj