=== modified file 'mandos'
--- mandos	2014-07-17 03:24:57 +0000
+++ mandos	2014-07-24 01:35:55 +0000
@@ -2188,11 +2188,11 @@
     token_duration = Token(re.compile(r"P"), None,
                            frozenset((token_year, token_month,
                                       token_day, token_time,
-                                      token_week))),
+                                      token_week)))
     # Define starting values
     value = datetime.timedelta() # Value so far
     found_token = None
-    followers = frozenset(token_duration,) # Following valid tokens
+    followers = frozenset((token_duration,)) # Following valid tokens
     s = duration                # String left to parse
     # Loop until end token is found
     while found_token is not token_end:

=== modified file 'mandos-ctl'
--- mandos-ctl	2014-07-17 03:24:57 +0000
+++ mandos-ctl	2014-07-24 01:35:55 +0000
@@ -157,11 +157,11 @@
     token_duration = Token(re.compile(r"P"), None,
                            frozenset((token_year, token_month,
                                       token_day, token_time,
-                                      token_week))),
+                                      token_week)))
     # Define starting values
     value = datetime.timedelta() # Value so far
     found_token = None
-    followers = frozenset(token_duration,) # Following valid tokens
+    followers = frozenset((token_duration,)) # Following valid tokens
     s = duration                # String left to parse
     # Loop until end token is found
     while found_token is not token_end: