Still need to use strenum to be able to generate car list in lpdp

selfdrive/car/body/values.py

@@ -1,4 +1,5 @@
-from enum import StrEnum
+# from enum import StrEnum
+from strenum import StrEnum
 from typing import Dict
 
 from cereal import car

selfdrive/car/chrysler/values.py

@@ -1,4 +1,5 @@
-from enum import IntFlag, StrEnum
+from enum import IntFlag#, StrEnum
+from strenum import StrEnum
 from dataclasses import dataclass, field
 from typing import Dict, List, Optional, Union
 

selfdrive/car/ford/values.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
 from dataclasses import dataclass
-from enum import Enum, StrEnum
+from enum import Enum#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/car/gm/values.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
 from dataclasses import dataclass
-from enum import Enum, StrEnum
+from enum import Enum#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/car/honda/values.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from enum import Enum, IntFlag, StrEnum
+from enum import Enum, IntFlag#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Optional, Union
 
 from cereal import car

selfdrive/car/hyundai/values.py

@@ -1,6 +1,7 @@
 import re
 from dataclasses import dataclass
-from enum import Enum, IntFlag, StrEnum
+from enum import Enum, IntFlag#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Optional, Set, Tuple, Union
 
 from cereal import car

selfdrive/car/mazda/values.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass, field
-from enum import StrEnum
+# from enum import StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/car/mock/values.py

@@ -1,4 +1,5 @@
-from enum import StrEnum
+# from enum import StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Optional, Union
 
 from openpilot.selfdrive.car.docs_definitions import CarInfo

selfdrive/car/nissan/values.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass, field
-from enum import StrEnum
+# from enum import StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Optional, Union
 
 from cereal import car

selfdrive/car/subaru/values.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass, field
-from enum import Enum, IntFlag, StrEnum
+from enum import Enum, IntFlag#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/car/tesla/values.py

@@ -1,5 +1,6 @@
 from collections import namedtuple
-from enum import StrEnum
+# from enum import StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/car/toyota/values.py

@@ -1,7 +1,8 @@
 import re
 from collections import defaultdict
 from dataclasses import dataclass, field
-from enum import Enum, IntFlag, StrEnum
+from enum import Enum, IntFlag#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Set, Union
 
 from cereal import car

selfdrive/car/volkswagen/values.py

@@ -1,6 +1,7 @@
 from collections import defaultdict, namedtuple
 from dataclasses import dataclass, field
-from enum import Enum, IntFlag, StrEnum
+from enum import Enum, IntFlag#, StrEnum
+from strenum import StrEnum
 from typing import Dict, List, Union
 
 from cereal import car

selfdrive/manager/manager.py

@@ -198,13 +198,6 @@ def manager_thread() -> None:
 
 
 def main() -> None:
-  # rick - use strenum.StrEnum istead of enum.StrEnum (which is missing in python 3.8)
-  # Check if the enum module is already imported
-  if 'enum' in sys.modules:
-    # If enum module is imported, replace StrEnum in the enum module
-    from strenum import StrEnum
-    sys.modules['enum'].StrEnum = StrEnum
-
   prepare_only = os.getenv("PREPAREONLY") is not None
 
   manager_init()