opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7096 from nsoranzo/followup_on_7067

Browse Source 
Fix ``size_to_bytes`` for some float values
This commit is contained in:
John Chilton
2018-12-12 09:54:55 -05:00
committed by GitHub
parent 0b0c008419 e5c9d9673d
commit c6fc4dc83a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/util/__init__.py
+8 -1
View File
@@ -1359,8 +1359,15 @@ def size_to_bytes(size):
4096
>>> size_to_bytes('2.2 TB')
2418925581107
>>> size_to_bytes('.01 TB')
10995116277
>>> size_to_bytes('1.b')
1
>>> size_to_bytes('1.2E2k')
122880
"""
size_re = re.compile(r'(?P<number>\d+(\.\d+)?)\s*(?P<multiple>[eptgmk]?(b|bytes?)?)?$')
# The following number regexp is based on https://stackoverflow.com/questions/385558/extract-float-double-value/385597#385597
size_re = re.compile(r'(?P<number>(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?)\s*(?P<multiple>[eptgmk]?(b|bytes?)?)?$')
size_match = size_re.match(size.lower())
if size_match is None:
raise ValueError("Could not parse string '%s'" % size)