Mercurial > public > mercurial-scm > hg
comparison mercurial/utils/dateutil.py @ 40256:d4d2c567bb72
py3: fix test-parse-date.t
Differential Revision: https://phab.mercurial-scm.org/D5084
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Sat, 13 Oct 2018 13:39:07 +0000 |
parents | c6061cadb400 |
children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
40255:4f1f024353ae | 40256:d4d2c567bb72 |
---|---|
301 | 301 |
302 date = date.strip() | 302 date = date.strip() |
303 | 303 |
304 if not date: | 304 if not date: |
305 raise error.Abort(_("dates cannot consist entirely of whitespace")) | 305 raise error.Abort(_("dates cannot consist entirely of whitespace")) |
306 elif date[0] == "<": | 306 elif date[0:1] == b"<": |
307 if not date[1:]: | 307 if not date[1:]: |
308 raise error.Abort(_("invalid day spec, use '<DATE'")) | 308 raise error.Abort(_("invalid day spec, use '<DATE'")) |
309 when = upper(date[1:]) | 309 when = upper(date[1:]) |
310 return lambda x: x <= when | 310 return lambda x: x <= when |
311 elif date[0] == ">": | 311 elif date[0:1] == b">": |
312 if not date[1:]: | 312 if not date[1:]: |
313 raise error.Abort(_("invalid day spec, use '>DATE'")) | 313 raise error.Abort(_("invalid day spec, use '>DATE'")) |
314 when = lower(date[1:]) | 314 when = lower(date[1:]) |
315 return lambda x: x >= when | 315 return lambda x: x >= when |
316 elif date[0] == "-": | 316 elif date[0:1] == b"-": |
317 try: | 317 try: |
318 days = int(date[1:]) | 318 days = int(date[1:]) |
319 except ValueError: | 319 except ValueError: |
320 raise error.Abort(_("invalid day spec: %s") % date[1:]) | 320 raise error.Abort(_("invalid day spec: %s") % date[1:]) |
321 if days < 0: | 321 if days < 0: |
322 raise error.Abort(_("%s must be nonnegative (see 'hg help dates')") | 322 raise error.Abort(_("%s must be nonnegative (see 'hg help dates')") |
323 % date[1:]) | 323 % date[1:]) |
324 when = makedate()[0] - days * 3600 * 24 | 324 when = makedate()[0] - days * 3600 * 24 |
325 return lambda x: x >= when | 325 return lambda x: x >= when |
326 elif " to " in date: | 326 elif b" to " in date: |
327 a, b = date.split(" to ") | 327 a, b = date.split(b" to ") |
328 start, stop = lower(a), upper(b) | 328 start, stop = lower(a), upper(b) |
329 return lambda x: x >= start and x <= stop | 329 return lambda x: x >= start and x <= stop |
330 else: | 330 else: |
331 start, stop = lower(date), upper(date) | 331 start, stop = lower(date), upper(date) |
332 return lambda x: x >= start and x <= stop | 332 return lambda x: x >= start and x <= stop |