From 175911fc6d3f9f3adb750efc37f54cbbc9cde23f Mon Sep 17 00:00:00 2001 From: Ralf Schmitt Date: Mon, 26 Mar 2012 00:44:02 +0200 Subject: [PATCH] use case insensitive matching when removing archive suffixes that removes things like .ZIP --- pypiserver/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pypiserver/core.py b/pypiserver/core.py index a9a719a..18f4103 100755 --- a/pypiserver/core.py +++ b/pypiserver/core.py @@ -24,12 +24,14 @@ def guess_pkgname(path): pkgname = re.split(r"-\d+", os.path.basename(path))[0] return pkgname +_archive_suffix_rx = re.compile(r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2)$", re.IGNORECASE) + def guess_pkgname_and_version(path): path = os.path.basename(path) pkgname = re.split(r"-\d+", path, 1)[0] version = path[len(pkgname) + 1:] - version = re.sub(r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2)$", "", version) + version = _archive_suffix_rx.sub("", version) return pkgname, version