/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-ctl

  • 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-ctl
157
157
    token_duration = Token(re.compile(r"P"), None,
158
158
                           frozenset((token_year, token_month,
159
159
                                      token_day, token_time,
160
 
                                      token_week)))
 
160
                                      token_week))),
161
161
    # Define starting values
162
162
    value = datetime.timedelta() # Value so far
163
163
    found_token = None
164
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
164
    followers = frozenset(token_duration,) # Following valid tokens
165
165
    s = duration                # String left to parse
166
166
    # Loop until end token is found
167
167
    while found_token is not token_end: