From fa0c7aa3b15b6edc016c7db6648ffec588406212 Mon Sep 17 00:00:00 2001
From: Omry Yadan <omry@fb.com>
Date: Sat, 12 Dec 2020 18:27:55 -0800
Subject: [PATCH] fixed configen test

---
 hydra/_internal/hydra.py         | 2 +-
 tools/configen/configen/utils.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hydra/_internal/hydra.py b/hydra/_internal/hydra.py
index 9e88ebd52c2..83c879f9162 100644
--- a/hydra/_internal/hydra.py
+++ b/hydra/_internal/hydra.py
@@ -562,7 +562,7 @@ def _print_defaults_tree_impl(
         indent: int = 0,
     ) -> None:
         assert log is not None
-        from ..core.new_default_element import GroupDefault, InputDefault, VirtualRoot
+        from ..core.default_element import GroupDefault, InputDefault, VirtualRoot
 
         def to_str(node: InputDefault) -> str:
             if isinstance(node, VirtualRoot):
diff --git a/tools/configen/configen/utils.py b/tools/configen/configen/utils.py
index 652dcd060af..fc7e624e9b1 100644
--- a/tools/configen/configen/utils.py
+++ b/tools/configen/configen/utils.py
@@ -39,15 +39,15 @@ def type_str(t: Any) -> str:
         if hasattr(t, "__name__"):
             name = str(t.__name__)
         else:
-            if t.name is None:
+            if t._name is None:
                 if t.__origin__ is not None:
                     name = type_str(t.__origin__)
             else:
-                name = str(t.name)
+                name = str(t._name)
 
     args = getattr(t, "__args__", None)
     if args is not None:
-        args = ", ".join([type_str(t) for t in (list(t.__args__))])
+        args = ", ".join([type_str(t) for t in t.__args__])
         ret = f"{name}[{args}]"
     else:
         ret = name