Restoring naming conv

Author: omesser

src/iterative_telemetry/__init__.py

@@ -199,29 +199,26 @@ def _find_or_create_user_id():
     config_dir = user_config_dir(
         os.path.join("iterative", "telemetry"), "iterative"
     )
-    user_id_file = os.path.join(config_dir, "user_id")
+    fname = os.path.join(config_dir, "user_id")
     lockfile = os.path.join(config_dir, "user_id.lock")
 
-    # Since the `user_id_file` and `lockfile` are under the
-    # global config, we need to make sure such directory exist
-    # already.
+    # Since the `fname` and `lockfile` are under the global config,
+    # we need to make sure such directory exist already.
     os.makedirs(config_dir, exist_ok=True)
-
     try:
         with FileLock(  # pylint: disable=abstract-class-instantiated
             lockfile, timeout=5
         ):
-
             try:
-                with open(user_id_file, encoding="utf8") as fobj:
+                with open(fname, encoding="utf8") as fobj:
                     user_id = json.load(fobj)["user_id"]
 
             except (FileNotFoundError, ValueError, KeyError):
 
                 # Backwards compatibility with DVC legacy telemetry location.
                 user_id = _try_read_legacy_user_id() or str(uuid.uuid4())
 
-                with open(user_id_file, "w", encoding="utf8") as fobj:
+                with open(fname, "w", encoding="utf8") as fobj:
                     json.dump({"user_id": user_id}, fobj)
 
             return user_id
@@ -232,12 +229,10 @@ def _find_or_create_user_id():
 
 
 def _try_read_legacy_user_id():
-    legacy_user_id_file = os.path.join(
-        user_config_dir("dvc", "iterative"), "user_id"
-    )
+    fname = os.path.join(user_config_dir("dvc", "iterative"), "user_id")
 
     try:
-        with open(legacy_user_id_file, encoding="utf8") as fobj:
+        with open(fname, encoding="utf8") as fobj:
             return json.load(fobj)["user_id"]
 
     except (FileNotFoundError, ValueError, KeyError):