Rename version_str to raw_version for consistency with raw_name

Author: sbidoul

src/pip/_internal/commands/list.py

@@ -329,7 +329,7 @@ def format_for_columns(
     for proj in pkgs:
         # if we're working on the 'outdated' list, separate out the
         # latest_version and type
-        row = [proj.raw_name, proj.version_str]
+        row = [proj.raw_name, proj.raw_version]
 
         if running_outdated:
             row.append(str(proj.latest_version))

src/pip/_internal/commands/show.py

@@ -139,7 +139,7 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
 
         yield _PackageInfo(
             name=dist.raw_name,
-            version=dist.version_str,
+            version=dist.raw_version,
             location=dist.location or "",
             editable_project_location=dist.editable_project_location,
             requires=requires,

src/pip/_internal/metadata/base.py

@@ -138,10 +138,10 @@ def from_wheel(cls, wheel: "Wheel", name: str) -> "BaseDistribution":
         raise NotImplementedError()
 
     def __repr__(self) -> str:
-        return f"{self.raw_name} {self.version_str} ({self.location})"
+        return f"{self.raw_name} {self.raw_version} ({self.location})"
 
     def __str__(self) -> str:
-        return f"{self.raw_name} {self.version_str}"
+        return f"{self.raw_name} {self.raw_version}"
 
     @property
     def location(self) -> Optional[str]:
@@ -276,7 +276,7 @@ def version(self) -> Version:
         raise NotImplementedError()
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         raise NotImplementedError()
 
     @property

src/pip/_internal/metadata/importlib/_dists.py

@@ -175,7 +175,7 @@ def version(self) -> Version:
         return parse_version(self._dist.version)
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         return self._dist.version
 
     def is_file(self, path: InfoPath) -> bool:

src/pip/_internal/metadata/pkg_resources.py

@@ -194,7 +194,7 @@ def version(self) -> Version:
         return parse_version(self._dist.version)
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         return self._dist.version
 
     def is_file(self, path: InfoPath) -> bool:

src/pip/_internal/operations/freeze.py

@@ -149,7 +149,7 @@ def _format_as_name_version(dist: BaseDistribution) -> str:
         dist_version = dist.version
     except InvalidVersion:
         # legacy version
-        return f"{dist.raw_name}==={dist.version_str}"
+        return f"{dist.raw_name}==={dist.raw_version}"
     else:
         return f"{dist.raw_name}=={dist_version}"
 

src/pip/_internal/req/req_uninstall.py

@@ -367,7 +367,7 @@ def remove(self, auto_confirm: bool = False, verbose: bool = False) -> None:
             )
             return
 
-        dist_name_version = f"{self._dist.raw_name}-{self._dist.version_str}"
+        dist_name_version = f"{self._dist.raw_name}-{self._dist.raw_version}"
         logger.info("Uninstalling %s:", dist_name_version)
 
         with indent_log():