Mercurial > babel > old > babel-test
comparison babel/dates.py @ 511:f2098e9c05b4 stable-0.9.x
Fix bad check in format_time (closes #257), reported with patch and tests by jomae
| author | fschwarz |
|---|---|
| date | Fri, 04 Mar 2011 22:34:14 +0000 |
| parents | 3295127550fe |
| children | 790d49d8ba30 |
comparison
equal
deleted
inserted
replaced
| 510:d877836a8455 | 511:f2098e9c05b4 |
|---|---|
| 576 if time.tzinfo is None: | 576 if time.tzinfo is None: |
| 577 time = time.replace(tzinfo=UTC) | 577 time = time.replace(tzinfo=UTC) |
| 578 if isinstance(time, datetime): | 578 if isinstance(time, datetime): |
| 579 if tzinfo is not None: | 579 if tzinfo is not None: |
| 580 time = time.astimezone(tzinfo) | 580 time = time.astimezone(tzinfo) |
| 581 if hasattr(tzinfo, 'localize'): # pytz | 581 if hasattr(tzinfo, 'normalize'): # pytz |
| 582 time = tzinfo.normalize(time) | 582 time = tzinfo.normalize(time) |
| 583 time = time.timetz() | 583 time = time.timetz() |
| 584 elif tzinfo is not None: | 584 elif tzinfo is not None: |
| 585 time = time.replace(tzinfo=tzinfo) | 585 time = time.replace(tzinfo=tzinfo) |
| 586 | 586 |