fnexe.com
/
pypiserver
forked from github.com/pypiserver
1
0
Fork 0
Code Pull Requests Activity

fix pytz issue #6 

relax the version regex a bit.
This commit is contained in:
Ralf Schmitt 2012-03-26 00:27:43 +02:00
parent dc0303bb1f
commit 7f97612a7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pypiserver/core.py
View File

@ -21,13 +21,13 @@ config = configuration()
def guess_pkgname(path):
pkgname = re.split(r"-\d+\.", os.path.basename(path))[0]
pkgname = re.split(r"-\d+", os.path.basename(path))[0]
return pkgname
def guess_pkgname_and_version(path):
path = os.path.basename(path)
pkgname = re.split(r"-\d+\.", path, 1)[0]
pkgname = re.split(r"-\d+", path, 1)[0]
version = path[len(pkgname) + 1:]
version = re.sub(r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2)$", "", version)
return pkgname, version