/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-07-17 03:24:57 UTC
  • mto: This revision was merged to the branch mainline in revision 720.
  • Revision ID: teddy@recompile.se-20140717032457-7074pobx7ft1oiio
Tags: version-1.6.7-1
* Makefile (version): Changed to "1.6.7".
* NEWS (Version 1.6.7): New entry.
* debian/changelog (1.6.7-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2188
2188
    token_duration = Token(re.compile(r"P"), None,
2189
2189
                           frozenset((token_year, token_month,
2190
2190
                                      token_day, token_time,
2191
 
                                      token_week)))
 
2191
                                      token_week))),
2192
2192
    # Define starting values
2193
2193
    value = datetime.timedelta() # Value so far
2194
2194
    found_token = None
2195
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
2196
2196
    s = duration                # String left to parse
2197
2197
    # Loop until end token is found
2198
2198
    while found_token is not token_end: