Skip to content

Commit 196f3d8

Browse files
committed
[fix] packages with dot
1 parent df45dfd commit 196f3d8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pypi_server/handlers/pypi/proxy/client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
def normalize_package_name(name):
19-
return name.lower().replace("_", "-")
19+
return name.lower().replace("_", "-").replace(".", "-")
2020

2121

2222
class PYPIClient(object):
@@ -44,7 +44,7 @@ def packages(cls):
4444
with (yield cls.LOCK.acquire()):
4545
index = dict(
4646
map(
47-
lambda x: (x.lower().replace("_", "-"), x),
47+
lambda x: (normalize_package_name(x), x),
4848
(yield cls.XMLRPC.list_packages())
4949
)
5050
)
@@ -77,10 +77,10 @@ def exists(cls, name):
7777
@classmethod
7878
@coroutine
7979
def find_real_name(cls, name):
80-
name = normalize_package_name(name)
80+
name = normalize_package_name(name).lower()
8181

8282
packages = yield cls.packages()
83-
real_name = packages.get(name.lower())
83+
real_name = packages.get(name)
8484

8585
if real_name is None:
8686
raise LookupError("Package not found")
@@ -91,7 +91,7 @@ def find_real_name(cls, name):
9191
@coroutine
9292
@Cache(4 * HOUR, files_cache=True, ignore_self=True)
9393
def releases(cls, name):
94-
process_versions = lambda x: set(map(HashVersion, x))
94+
process_versions = lambda x: set(HashVersion(i) for i in x)
9595

9696
all_releases, current_releases = yield [
9797
cls.XMLRPC.package_releases(name, True),

pypi_server/hash_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@total_ordering
77
class HashVersion(LooseVersion):
88
def __init__(self, vstring=None):
9-
super(HashVersion, self).__init__(vstring=vstring)
9+
LooseVersion.__init__(self, vstring=vstring)
1010
self.version = tuple(map(str, self.version))
1111

1212
def __hash__(self):

0 commit comments

Comments
 (0)