1.1 --- a/imip_text_client.py Sat Feb 03 23:34:24 2018 +0100
1.2 +++ b/imip_text_client.py Sat Feb 03 23:35:55 2018 +0100
1.3 @@ -320,7 +320,8 @@
1.4 label = "New"
1.5
1.6 error_label = errors and " (errors: %s)" % ", ".join(errors) or ""
1.7 - print "(%d) %s%s:" % (index, label, error_label), p.get_start(), p.get_end(), p.origin
1.8 + print "(%d) %s%s:" % (index, label, error_label), \
1.9 + str(p.get_form_start()), str(p.get_form_end()), p.origin
1.10
1.11 def show_periods_raw(periods):
1.12
1.13 @@ -334,7 +335,7 @@
1.14
1.15 "Show period 'p' in a simple raw form."
1.16
1.17 - print p.get_start(), p.get_end(), p.origin
1.18 + print str(p.get_form_start()), str(p.get_form_end()), p.origin
1.19
1.20 def show_rule(selectors):
1.21
1.22 @@ -562,7 +563,6 @@
1.23 end = self.get_window_end() or None
1.24
1.25 selector = vRecurrence.get_selector(start, selectors)
1.26 - until = None
1.27 inclusive = False
1.28
1.29 # Generate the periods from the rule.
1.30 @@ -912,15 +912,24 @@
1.31 print "Editing end (%s)" % period.get_end()
1.32 edit_date(period.end, args)
1.33
1.34 + period.reset()
1.35 +
1.36 def edit_date(date, args=None):
1.37
1.38 "Edit the given 'date' object attributes."
1.39
1.40 date.date = next_arg(args) or input_with_default("Date (%s)? ", date.date)
1.41 date.hour = next_arg(args) or input_with_default("Hour (%s)? ", date.hour)
1.42 - date.minute = next_arg(args) or input_with_default("Minute (%s)? ", date.minute)
1.43 - date.second = next_arg(args) or input_with_default("Second (%s)? ", date.second)
1.44 - date.tzid = next_arg(args) or input_with_default("Time zone (%s)? ", date.tzid)
1.45 +
1.46 + # Permit day-level datetimes.
1.47 +
1.48 + if date.hour == "-":
1.49 + date.set_as_day()
1.50 + else:
1.51 + date.minute = next_arg(args) or input_with_default("Minute (%s)? ", date.minute)
1.52 + date.second = next_arg(args) or input_with_default("Second (%s)? ", date.second)
1.53 + date.tzid = next_arg(args) or input_with_default("Time zone (%s)? ", date.tzid)
1.54 +
1.55 date.reset()
1.56
1.57 def add_rule_selector_count(selectors, args, selector=None):