Declare doctests needing NORMALIZE_WHITESPACE & ELLIPSIS

Also corrects parsing errors due to tests missing the Python REPL's
line continuation prompt (i.e. ...).

1 files changed, 108 insertions, 62 deletions

diff --git a/docs/examples.rst b/docs/examples.rst
index ce52c63..7d2181e 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -149,6 +149,7 @@ find the first day of the 15th week of 1997.
 How long ago has the millennium changed?
 
 .. doctest:: relativedelta
+    :options: +NORMALIZE_WHITESPACE
 
     >>> relativedelta(NOW, date(2001,1,1))
     relativedelta(years=+2, months=+8, days=+16,
@@ -157,6 +158,7 @@ How long ago has the millennium changed?
 How old is John?
 
 .. doctest:: relativedelta
+    :options: +NORMALIZE_WHITESPACE
 
     >>> johnbirthday = datetime(1978, 4, 5, 12, 0)
     >>> relativedelta(NOW, johnbirthday)
@@ -234,9 +236,10 @@ Prepare the environment.
 Daily, for 10 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(DAILY, count=10,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 3, 9, 0),
      datetime.datetime(1997, 9, 4, 9, 0),
@@ -251,14 +254,15 @@ Daily, for 10 occurrences.
 Daily until December 24, 1997
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE, +ELLIPSIS
 
     >>> list(rrule(DAILY,
-               dtstart=parse("19970902T090000"),
-               until=parse("19971224T000000")))
+    ...            dtstart=parse("19970902T090000"),
+    ...            until=parse("19971224T000000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 3, 9, 0),
      datetime.datetime(1997, 9, 4, 9, 0),
-     (...)
+     ...
      datetime.datetime(1997, 12, 21, 9, 0),
      datetime.datetime(1997, 12, 22, 9, 0),
      datetime.datetime(1997, 12, 23, 9, 0)]
@@ -266,9 +270,10 @@ Daily until December 24, 1997
 Every other day, 5 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(DAILY, interval=2, count=5,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 4, 9, 0),
      datetime.datetime(1997, 9, 6, 9, 0),
@@ -278,9 +283,10 @@ Every other day, 5 occurrences.
 Every 10 days, 5 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(DAILY, interval=10, count=5,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 12, 9, 0),
      datetime.datetime(1997, 9, 22, 9, 0),
@@ -290,24 +296,25 @@ Every 10 days, 5 occurrences.
 Everyday in January, for 3 years.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE, +ELLIPSIS
 
     >>> list(rrule(YEARLY, bymonth=1, byweekday=range(7),
-               dtstart=parse("19980101T090000"),
-               until=parse("20000131T090000")))
+    ...            dtstart=parse("19980101T090000"),
+    ...            until=parse("20000131T090000")))
     [datetime.datetime(1998, 1, 1, 9, 0),
      datetime.datetime(1998, 1, 2, 9, 0),
-     (...)
+     ...
      datetime.datetime(1998, 1, 30, 9, 0),
      datetime.datetime(1998, 1, 31, 9, 0),
      datetime.datetime(1999, 1, 1, 9, 0),
      datetime.datetime(1999, 1, 2, 9, 0),
-     (...)
+     ...
      datetime.datetime(1999, 1, 30, 9, 0),
      datetime.datetime(1999, 1, 31, 9, 0),
      datetime.datetime(2000, 1, 1, 9, 0),
      datetime.datetime(2000, 1, 2, 9, 0),
-     (...)
      datetime.datetime(2000, 1, 29, 9, 0),
+     ...
      datetime.datetime(2000, 1, 31, 9, 0)]
 
 Same thing, in another way.
@@ -322,9 +329,10 @@ Same thing, in another way.
 Weekly for 10 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, count=10,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 9, 9, 0),
      datetime.datetime(1997, 9, 16, 9, 0),
@@ -339,9 +347,10 @@ Weekly for 10 occurrences.
 Every other week, 6 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, interval=2, count=6,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 16, 9, 0),
      datetime.datetime(1997, 9, 30, 9, 0),
@@ -352,9 +361,10 @@ Every other week, 6 occurrences.
 Weekly on Tuesday and Thursday for 5 weeks.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, count=10, wkst=SU, byweekday=(TU,TH),
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 4, 9, 0),
      datetime.datetime(1997, 9, 9, 9, 0),
@@ -369,10 +379,11 @@ Weekly on Tuesday and Thursday for 5 weeks.
 Every other week on Tuesday and Thursday, for 8 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, interval=2, count=8,
-               wkst=SU, byweekday=(TU,TH),
-               dtstart=parse("19970902T090000")))
+    ...            wkst=SU, byweekday=(TU,TH),
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 4, 9, 0),
      datetime.datetime(1997, 9, 16, 9, 0),
@@ -385,9 +396,10 @@ Every other week on Tuesday and Thursday, for 8 occurrences.
 Monthly on the 1st Friday for ten occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=10, byweekday=FR(1),
-               dtstart=parse("19970905T090000")))
+    ...            dtstart=parse("19970905T090000")))
     [datetime.datetime(1997, 9, 5, 9, 0),
      datetime.datetime(1997, 10, 3, 9, 0),
      datetime.datetime(1997, 11, 7, 9, 0),
@@ -402,10 +414,11 @@ Monthly on the 1st Friday for ten occurrences.
 Every other month on the 1st and last Sunday of the month for 10 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, interval=2, count=10,
-               byweekday=(SU(1), SU(-1)),
-               dtstart=parse("19970907T090000")))
+    ...            byweekday=(SU(1), SU(-1)),
+    ...            dtstart=parse("19970907T090000")))
     [datetime.datetime(1997, 9, 7, 9, 0),
      datetime.datetime(1997, 9, 28, 9, 0),
      datetime.datetime(1997, 11, 2, 9, 0),
@@ -420,9 +433,10 @@ Every other month on the 1st and last Sunday of the month for 10 occurrences.
 Monthly on the second to last Monday of the month for 6 months.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=6, byweekday=MO(-2),
-               dtstart=parse("19970922T090000")))
+    ...            dtstart=parse("19970922T090000")))
     [datetime.datetime(1997, 9, 22, 9, 0),
      datetime.datetime(1997, 10, 20, 9, 0),
      datetime.datetime(1997, 11, 17, 9, 0),
@@ -434,9 +448,10 @@ Monthly on the second to last Monday of the month for 6 months.
 Monthly on the third to the last day of the month, for 6 months.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=6, bymonthday=-3,
-               dtstart=parse("19970928T090000")))
+    ...            dtstart=parse("19970928T090000")))
     [datetime.datetime(1997, 9, 28, 9, 0),
      datetime.datetime(1997, 10, 29, 9, 0),
      datetime.datetime(1997, 11, 28, 9, 0),
@@ -448,9 +463,10 @@ Monthly on the third to the last day of the month, for 6 months.
 Monthly on the 2nd and 15th of the month for 5 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=5, bymonthday=(2,15),
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 15, 9, 0),
      datetime.datetime(1997, 10, 2, 9, 0),
@@ -461,10 +477,10 @@ Monthly on the 2nd and 15th of the month for 5 occurrences.
 Monthly on the first and last day of the month for 3 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=5, bymonthday=(-1,1,),
-                   dtstart=parse("1997090
-    2T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 30, 9, 0),
      datetime.datetime(1997, 10, 1, 9, 0),
      datetime.datetime(1997, 10, 31, 9, 0),
@@ -475,10 +491,11 @@ Monthly on the first and last day of the month for 3 occurrences.
 Every 18 months on the 10th thru 15th of the month for 10 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, interval=18, count=10,
-               bymonthday=range(10,16),
-               dtstart=parse("19970910T090000")))
+    ...            bymonthday=range(10,16),
+    ...            dtstart=parse("19970910T090000")))
     [datetime.datetime(1997, 9, 10, 9, 0),
      datetime.datetime(1997, 9, 11, 9, 0),
      datetime.datetime(1997, 9, 12, 9, 0),
@@ -494,9 +511,10 @@ Every 18 months on the 10th thru 15th of the month for 10 occurrences.
 Every Tuesday, every other month, 6 occurences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, interval=2, count=6, byweekday=TU,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 9, 9, 0),
      datetime.datetime(1997, 9, 16, 9, 0),
@@ -508,10 +526,10 @@ Every Tuesday, every other month, 6 occurences.
 Yearly in June and July for 10 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, count=4, bymonth=(6,7),
-               dtstart=parse("19970610T0900
-    00")))
+    ...            dtstart=parse("19970610T090000")))
     [datetime.datetime(1997, 6, 10, 9, 0),
      datetime.datetime(1997, 7, 10, 9, 0),
      datetime.datetime(1998, 6, 10, 9, 0),
@@ -521,9 +539,10 @@ Yearly in June and July for 10 occurrences.
 Every 3rd year on the 1st, 100th and 200th day for 4 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, count=4, interval=3, byyearday=(1,100,200),
-               dtstart=parse("19970101T090000")))
+    ...            dtstart=parse("19970101T090000")))
     [datetime.datetime(1997, 1, 1, 9, 0),
      datetime.datetime(1997, 4, 10, 9, 0),
      datetime.datetime(1997, 7, 19, 9, 0),
@@ -533,9 +552,10 @@ Every 3rd year on the 1st, 100th and 200th day for 4 occurrences.
 Every 20th Monday of the year, 3 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, count=3, byweekday=MO(20),
-               dtstart=parse("19970519T090000")))
+    ...            dtstart=parse("19970519T090000")))
     [datetime.datetime(1997, 5, 19, 9, 0),
      datetime.datetime(1998, 5, 18, 9, 0),
      datetime.datetime(1999, 5, 17, 9, 0)]
@@ -545,9 +565,10 @@ Monday of week number 20 (where the default start of the week is Monday),
 3 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, count=3, byweekno=20, byweekday=MO,
-               dtstart=parse("19970512T090000")))
+    ...            dtstart=parse("19970512T090000")))
     [datetime.datetime(1997, 5, 12, 9, 0),
      datetime.datetime(1998, 5, 11, 9, 0),
      datetime.datetime(1999, 5, 17, 9, 0)]
@@ -556,9 +577,10 @@ Monday of week number 20 (where the default start of the week is Monday),
 The week number 1 may be in the last year.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, count=3, byweekno=1, byweekday=MO,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 12, 29, 9, 0),
      datetime.datetime(1999, 1, 4, 9, 0),
      datetime.datetime(2000, 1, 3, 9, 0)]
@@ -567,9 +589,10 @@ The week number 1 may be in the last year.
 And the week numbers greater than 51 may be in the next year.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, count=3, byweekno=52, byweekday=SU,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 12, 28, 9, 0),
      datetime.datetime(1998, 12, 27, 9, 0),
      datetime.datetime(2000, 1, 2, 9, 0)]
@@ -578,9 +601,10 @@ And the week numbers greater than 51 may be in the next year.
 Only some years have week number 53:
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, count=3, byweekno=53, byweekday=MO,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1998, 12, 28, 9, 0),
      datetime.datetime(2004, 12, 27, 9, 0),
      datetime.datetime(2009, 12, 28, 9, 0)]
@@ -589,9 +613,10 @@ Only some years have week number 53:
 Every Friday the 13th, 4 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, count=4, byweekday=FR, bymonthday=13,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1998, 2, 13, 9, 0),
      datetime.datetime(1998, 3, 13, 9, 0),
      datetime.datetime(1998, 11, 13, 9, 0),
@@ -602,10 +627,11 @@ Every four years, the first Tuesday after a Monday in November,
 3 occurrences (U.S. Presidential Election day):
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(YEARLY, interval=4, count=3, bymonth=11,
-               byweekday=TU, bymonthday=(2,3,4,5,6,7,8),
-               dtstart=parse("19961105T090000")))
+    ...            byweekday=TU, bymonthday=(2,3,4,5,6,7,8),
+    ...            dtstart=parse("19961105T090000")))
     [datetime.datetime(1996, 11, 5, 9, 0),
      datetime.datetime(2000, 11, 7, 9, 0),
      datetime.datetime(2004, 11, 2, 9, 0)]
@@ -615,9 +641,10 @@ The 3rd instance into the month of one of Tuesday, Wednesday or
 Thursday, for the next 3 months:
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=3, byweekday=(TU,WE,TH),
-               bysetpos=3, dtstart=parse("19970904T090000")))
+    ...            bysetpos=3, dtstart=parse("19970904T090000")))
     [datetime.datetime(1997, 9, 4, 9, 0),
      datetime.datetime(1997, 10, 7, 9, 0),
      datetime.datetime(1997, 11, 6, 9, 0)]
@@ -626,9 +653,10 @@ Thursday, for the next 3 months:
 The 2nd to last weekday of the month, 3 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MONTHLY, count=3, byweekday=(MO,TU,WE,TH,FR),
-               bysetpos=-2, dtstart=parse("19970929T090000")))
+    ...            bysetpos=-2, dtstart=parse("19970929T090000")))
     [datetime.datetime(1997, 9, 29, 9, 0),
      datetime.datetime(1997, 10, 30, 9, 0),
      datetime.datetime(1997, 11, 27, 9, 0)]
@@ -637,10 +665,11 @@ The 2nd to last weekday of the month, 3 occurrences.
 Every 3 hours from 9:00 AM to 5:00 PM on a specific day.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(HOURLY, interval=3,
-               dtstart=parse("19970902T090000"),
-               until=parse("19970902T170000")))
+    ...            dtstart=parse("19970902T090000"),
+    ...            until=parse("19970902T170000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 2, 12, 0),
      datetime.datetime(1997, 9, 2, 15, 0)]
@@ -649,9 +678,10 @@ Every 3 hours from 9:00 AM to 5:00 PM on a specific day.
 Every 15 minutes for 6 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MINUTELY, interval=15, count=6,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 2, 9, 15),
      datetime.datetime(1997, 9, 2, 9, 30),
@@ -663,9 +693,10 @@ Every 15 minutes for 6 occurrences.
 Every hour and a half for 4 occurrences.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(MINUTELY, interval=90, count=4,
-               dtstart=parse("19970902T090000")))
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 2, 10, 30),
      datetime.datetime(1997, 9, 2, 12, 0),
@@ -675,18 +706,19 @@ Every hour and a half for 4 occurrences.
 Every 20 minutes from 9:00 AM to 4:40 PM for two days.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE, +ELLIPSIS
 
     >>> list(rrule(MINUTELY, interval=20, count=48,
-               byhour=range(9,17), byminute=(0,20,40),
-               dtstart=parse("19970902T090000")))
+    ...            byhour=range(9,17), byminute=(0,20,40),
+    ...            dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 2, 9, 20),
-     (...)
+     ...
      datetime.datetime(1997, 9, 2, 16, 20),
      datetime.datetime(1997, 9, 2, 16, 40),
      datetime.datetime(1997, 9, 3, 9, 0),
      datetime.datetime(1997, 9, 3, 9, 20),
-     (...)
+     ...
      datetime.datetime(1997, 9, 3, 16, 20),
      datetime.datetime(1997, 9, 3, 16, 40)]
 
@@ -694,18 +726,19 @@ Every 20 minutes from 9:00 AM to 4:40 PM for two days.
 An example where the days generated makes a difference because of `wkst`.
 
 .. doctest:: rrule
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrule(WEEKLY, interval=2, count=4,
-               byweekday=(TU,SU), wkst=MO,
-               dtstart=parse("19970805T090000")))
+    ...            byweekday=(TU,SU), wkst=MO,
+    ...            dtstart=parse("19970805T090000")))
     [datetime.datetime(1997, 8, 5, 9, 0),
      datetime.datetime(1997, 8, 10, 9, 0),
      datetime.datetime(1997, 8, 19, 9, 0),
      datetime.datetime(1997, 8, 24, 9, 0)]
 
     >>> list(rrule(WEEKLY, interval=2, count=4,
-               byweekday=(TU,SU), wkst=SU,
-               dtstart=parse("19970805T090000")))
+    ...            byweekday=(TU,SU), wkst=SU,
+    ...            dtstart=parse("19970805T090000")))
     [datetime.datetime(1997, 8, 5, 9, 0),
      datetime.datetime(1997, 8, 17, 9, 0),
      datetime.datetime(1997, 8, 19, 9, 0),
@@ -717,12 +750,13 @@ rruleset examples
 Daily, for 7 days, jumping Saturday and Sunday occurrences.
 
 .. doctest:: rruleset
+   :options: +NORMALIZE_WHITESPACE
 
     >>> set = rruleset()
     >>> set.rrule(rrule(DAILY, count=7,
-                dtstart=parse("19970902T090000")))
+    ...                 dtstart=parse("19970902T090000")))
     >>> set.exrule(rrule(YEARLY, byweekday=(SA,SU),
-                 dtstart=parse("19970902T090000")))
+    ...                  dtstart=parse("19970902T090000")))
     >>> list(set)
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 3, 9, 0),
@@ -734,10 +768,11 @@ Daily, for 7 days, jumping Saturday and Sunday occurrences.
 Weekly, for 4 weeks, plus one time on day 7, and not on day 16.
 
 .. doctest:: rruleset
+   :options: +NORMALIZE_WHITESPACE
 
     >>> set = rruleset()
     >>> set.rrule(rrule(WEEKLY, count=4,
-                dtstart=parse("19970902T090000")))
+    ...           dtstart=parse("19970902T090000")))
     >>> set.rdate(datetime.datetime(1997, 9, 7, 9, 0))
     >>> set.exdate(datetime.datetime(1997, 9, 16, 9, 0))
     >>> list(set)
@@ -753,6 +788,7 @@ rrulestr() examples
 Every 10 days, 5 occurrences.
 
 .. doctest:: rrulestr
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrulestr("""
     ... DTSTART:19970902T090000
@@ -768,9 +804,10 @@ Every 10 days, 5 occurrences.
 Same thing, but passing only the `RRULE` value.
 
 .. doctest:: rrulestr
+   :options: +NORMALIZE_WHITESPACE
 
     >>> list(rrulestr("FREQ=DAILY;INTERVAL=10;COUNT=5",
-              dtstart=parse("19970902T090000")))
+    ...               dtstart=parse("19970902T090000")))
     [datetime.datetime(1997, 9, 2, 9, 0),
      datetime.datetime(1997, 9, 12, 9, 0),
      datetime.datetime(1997, 9, 22, 9, 0),
@@ -782,30 +819,32 @@ Notice that when using a single rule, it returns an
 `rrule` instance, unless `forceset` was used.
 
 .. doctest:: rrulestr
+   :options: +ELLIPSIS
 
     >>> rrulestr("FREQ=DAILY;INTERVAL=10;COUNT=5")
-    <dateutil.rrule.rrule instance at 0x30269f08>
+    <dateutil.rrule.rrule object at 0x...>
 
     >>> rrulestr("""
     ... DTSTART:19970902T090000
     ... RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5
     ... """)
-    <dateutil.rrule.rrule instance at 0x302699e0>
+    <dateutil.rrule.rrule object at 0x...>
 
     >>> rrulestr("FREQ=DAILY;INTERVAL=10;COUNT=5", forceset=True)
-    <dateutil.rrule.rruleset instance at 0x30269f08>
+    <dateutil.rrule.rruleset object at 0x...>
 
 
 But when an `rruleset` is needed, it is automatically used.
 
 .. doctest:: rrulestr
+   :options: +ELLIPSIS
 
     >>> rrulestr("""
     ... DTSTART:19970902T090000
     ... RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5
     ... RRULE:FREQ=DAILY;INTERVAL=5;COUNT=3
     ... """)
-    <dateutil.rrule.rruleset instance at 0x302699e0>
+    <dateutil.rrule.rruleset object at 0x...>
 
 
 parse examples
@@ -826,6 +865,7 @@ Some simple examples based on the `date` command, using the
 `ZOFFSET` dictionary to provide the BRST timezone offset.
 
 .. doctest:: tz
+    :options: +NORMALIZE_WHITESPACE
 
     >>> parse("Thu Sep 25 10:36:28 BRST 2003", tzinfos=TZOFFSETS)
     datetime.datetime(2003, 9, 25, 10, 36, 28,
@@ -911,6 +951,7 @@ Strip in a different way:
 Another format, based on `date -R` (RFC822):
 
 .. doctest:: tz
+   :options: +NORMALIZE_WHITESPACE
 
     >>> parse("Thu, 25 Sep 2003 10:49:41 -0300")
     datetime.datetime(2003, 9, 25, 10, 49, 41,
@@ -920,6 +961,7 @@ Another format, based on `date -R` (RFC822):
 ISO format:
 
 .. doctest:: tz
+   :options: +NORMALIZE_WHITESPACE
 
     >>> parse("2003-09-25T10:49:41.5-03:00")
     datetime.datetime(2003, 9, 25, 10, 49, 41, 500000,
@@ -946,6 +988,7 @@ Some variations:
 ISO format, without separators:
 
 .. doctest:: tz
+   :options: +NORMALIZE_WHITESPACE
 
     >>> parse("20030925T104941.5-0300")
     datetime.datetime(2003, 9, 25, 10, 49, 41, 500000,
@@ -1091,6 +1134,7 @@ Some special treating for ''pertain'' relations:
 Fuzzy parsing:
 
 .. doctest:: tz
+   :options: +NORMALIZE_WHITESPACE
 
     >>> s = "Today is 25 of September of 2003, exactly " \
     ...     "at 10:49:41 with timezone -03:00."
@@ -1144,6 +1188,7 @@ tzoffset examples
 -----------------
 
 .. doctest:: tzoffset
+   :options: +NORMALIZE_WHITESPACE
 
     >>> from datetime import *
     >>> from dateutil.tz import *
@@ -1268,9 +1313,9 @@ tzrange examples
     >>> range1 = tzrange("EST", -18000, "EDT")
     >>> range2 = tzrange("EST", -18000, "EDT", -14400,
     ...                  relativedelta(hours=+2, month=4, day=1,
-                       weekday=SU(+1)),
+    ...                                weekday=SU(+1)),
     ...                  relativedelta(hours=+1, month=10, day=31,
-                       weekday=SU(-1)))
+    ...                                weekday=SU(-1)))
     >>> tzstr('EST5EDT') == range1 == range2
     True
 
@@ -1290,6 +1335,7 @@ tzfile examples
 ---------------
 
 .. doctest:: tzfile
+   :options: +NORMALIZE_WHITESPACE
 
     >>> tz = tzfile("/etc/localtime")
     >>> datetime.now(tz)