diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-09-03 21:08:50 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-09-03 21:08:50 +0700 |
| commit | 88fc294f7f03ce6af9787c6d9c3bad7fc5fade10 (patch) | |
| tree | 5e2d883bdbc86dc68b3e1f23181fefb68dcb2276 /youtube_dl/utils.py | |
| parent | 884ae747859a9819292f9a0199a3d76b0cb1d98f (diff) | |
| parent | a232bb9551b1b99fed159d3395b7be363258fb21 (diff) | |
| download | youtube-dl-88fc294f7f03ce6af9787c6d9c3bad7fc5fade10.tar.xz | |
Merge branch 'peugeot-tnaflix'
Diffstat (limited to 'youtube_dl/utils.py')
| -rw-r--r-- | youtube_dl/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 91afe8622..3846dfdca 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1336,7 +1336,7 @@ def parse_duration(s): s = s.strip() m = re.match( - r'(?:(?:(?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s*)?(?P<mins>[0-9]+)\s*(?:[:m]|mins?|minutes?)\s*)?(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*(?:s|secs?|seconds?)?$', s) + r'(?i)(?:(?:(?P<hours>[0-9]+)\s*(?:[:h]|hours?)\s*)?(?P<mins>[0-9]+)\s*(?:[:m]|mins?|minutes?)\s*)?(?P<secs>[0-9]+)(?P<ms>\.[0-9]+)?\s*(?:s|secs?|seconds?)?$', s) if not m: return None res = int(m.group('secs')) |