pypi package aliases do not need to be a list

replit · Jan 2, 2024 · e6be876 · e6be876
1 parent 9755ebf
commit e6be876
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/internal/backends/python/grab.go b/internal/backends/python/grab.go
@@ -315,7 +315,7 @@ func filterImports(ctx context.Context, foundPkgs map[string]bool) (map[string][
 			}
 
 			// test aliases
-			overrides, ok = moduleToPypiPackageAliases[testModName]
+			pkg, ok = moduleToPypiPackageAliases[testModName]
 			if ok {
 				break
 			}

diff --git a/internal/backends/python/pypi_map.override.go b/internal/backends/python/pypi_map.override.go
@@ -19,8 +19,8 @@ var moduleToPypiPackageOverride = map[string][]string{
  * These are packages that provide helpful aliases, but otherwise provide no functionality.
  * We should prefer the real version.
  */
-var moduleToPypiPackageAliases = map[string][]string{
-	"bs4":      {"beautifulsoup4"},
-	"discord":  {"discord.py"},
-	"psycopg2": {"psycopg2-binary"}, // psycopg2 is a source package, psycopg2-binary is the dist wheel
+var moduleToPypiPackageAliases = map[string]string{
+	"bs4":      "beautifulsoup4",
+	"discord":  "discord.py",
+	"psycopg2": "psycopg2-binary", // psycopg2 is a source package, psycopg2-binary is the dist wheel
 }
diff --git a/internal/backends/python/python.go b/internal/backends/python/python.go
@@ -180,7 +180,7 @@ func add(ctx context.Context, pkgs map[api.PkgName]api.PkgSpec, projectName stri
 		name := string(name)
 		if found, ok := moduleToPypiPackageAliases[name]; ok {
 			delete(pkgs, api.PkgName(name))
-			name = found[0]
+			name = found
 			pkgs[api.PkgName(name)] = api.PkgSpec(spec)
 		}
 		spec := string(spec)
@@ -382,7 +382,7 @@ func makePythonPipBackend(python string) api.LanguageBackend {
 				spec := string(spec)
 				if found, ok := moduleToPypiPackageAliases[name]; ok {
 					delete(pkgs, api.PkgName(name))
-					name = found[0]
+					name = found
 					pkgs[api.PkgName(name)] = api.PkgSpec(spec)
 				}