func out

Author: omesser

src/iterative_telemetry/__init__.py

@@ -196,37 +196,18 @@ def _find_or_create_user_id():
     IDs are generated randomly with UUID.
     """
 
-    legacy_dvc_config_dir = user_config_dir("dvc", "iterative")
     config_dir = user_config_dir(
         os.path.join("iterative", "telemetry"), "iterative"
     )
-    legacy_user_id_file = os.path.join(legacy_dvc_config_dir, "user_id")
     user_id_file = os.path.join(config_dir, "user_id")
     lockfile = os.path.join(config_dir, "user_id.lock")
 
     try:
         with FileLock(  # pylint: disable=abstract-class-instantiated
             lockfile, timeout=5
         ):
-            try:
-
-                # Backwards compatibility with DVC legacy telemetry location.
-                # Will only try to copy over if config_dir doesn't
-                # exist (first run per machine)
-                if legacy_dvc_config_dir.exists() and not config_dir.exists():
-                    with open(
-                        legacy_user_id_file, encoding="utf8"
-                    ) as fobj_legacy:
-                        with open(
-                            user_id_file, "w", encoding="utf8"
-                        ) as fobj_new:
-                            user_id = json.load(fobj_legacy)["user_id"]
-                            json.dump({"user_id": user_id}, fobj_new)
-
-            except (FileNotFoundError, ValueError, KeyError):
-
-                # Fail silently
-                pass
+            # Backwards compatibility with DVC legacy telemetry location.
+            _try_load_legacy_user_id(config_dir, user_id_file)
 
             try:
 
@@ -249,3 +230,22 @@ def _find_or_create_user_id():
     except Timeout:
         logger.debug("Failed to acquire %s", lockfile)
     return None
+
+
+def _try_load_legacy_user_id(config_dir, user_id_file):
+    legacy_config_dir = user_config_dir("dvc", "iterative")
+    legacy_user_id_file = os.path.join(legacy_config_dir, "user_id")
+
+    try:
+        # Will only to copy over if config_dir doesn't
+        # exist (first run per machine)
+        if legacy_config_dir.exists() and not config_dir.exists():
+            with open(legacy_user_id_file, encoding="utf8") as fobj_legacy:
+                with open(user_id_file, "w", encoding="utf8") as fobj_new:
+                    user_id = json.load(fobj_legacy)["user_id"]
+                    json.dump({"user_id": user_id}, fobj_new)
+
+    except (FileNotFoundError, ValueError, KeyError):
+
+        # Fail silently
+        pass