Replaced some doctest output with ellipses.

Following Chris' advice.  Don't know what I was thinking before ;).

diff --git a/becommands/merge.py b/becommands/merge.py
index 927bb63e271e49d8ce8d844973451c8ad26f4cef..8232282585ce6f7bfc7fa4fc68610dad84b0d94b 100644 (file)
--- a/becommands/merge.py
+++ b/becommands/merge.py
@@ -45,7 +45,7 @@ def execute(args, test=False):
     >>> a.load_comments()
     >>> mergeA = a.comment_from_shortname(":3")
     >>> mergeA.time = 3
-    >>> print a.string(show_comments=True)
+    >>> print a.string(show_comments=True) # doctest: +ELLIPSIS
               ID : a
       Short name : a
         Severity : minor
@@ -54,43 +54,43 @@ def execute(args, test=False):
           Target : 
         Reporter : 
          Creator : John Doe <jdoe@example.com>
-         Created : Wed, 31 Dec 1969 19:00 (Thu, 01 Jan 1970 00:00:00 +0000)
+         Created : ...
     Bug A
     --------- Comment ---------
     Name: a:1
-    From: wking <wking@thor.yang.physics.drexel.edu>
-    Date: Thu, 01 Jan 1970 00:00:01 +0000
+    From: ...
+    Date: ...
     <BLANKLINE>
     Testing
       --------- Comment ---------
       Name: a:2
-      From: wking <wking@thor.yang.physics.drexel.edu>
-      Date: Thu, 01 Jan 1970 00:00:02 +0000
+      From: ...
+      Date: ...
     <BLANKLINE>
       Testing...
     --------- Comment ---------
     Name: a:3
-    From: wking <wking@thor.yang.physics.drexel.edu>
-    Date: Thu, 01 Jan 1970 00:00:03 +0000
+    From: ...
+    Date: ...
     <BLANKLINE>
     Merged from bug b
       --------- Comment ---------
       Name: a:4
-      From: wking <wking@thor.yang.physics.drexel.edu>
-      Date: Thu, 01 Jan 1970 00:00:01 +0000
+      From: ...
+      Date: ...
     <BLANKLINE>
       1 2
         --------- Comment ---------
         Name: a:5
-        From: wking <wking@thor.yang.physics.drexel.edu>
-        Date: Thu, 01 Jan 1970 00:00:02 +0000
+        From: ...
+        Date: ...
     <BLANKLINE>
         1 2 3 4
     >>> b = bd.bug_from_shortname("b")
     >>> b.load_comments()
     >>> mergeB = b.comment_from_shortname(":3")
     >>> mergeB.time = 3
-    >>> print b.string(show_comments=True)
+    >>> print b.string(show_comments=True) # doctest: +ELLIPSIS
               ID : b
       Short name : b
         Severity : minor
@@ -99,24 +99,24 @@ def execute(args, test=False):
           Target : 
         Reporter : 
          Creator : Jane Doe <jdoe@example.com>
-         Created : Wed, 31 Dec 1969 19:00 (Thu, 01 Jan 1970 00:00:00 +0000)
+         Created : ...
     Bug B
     --------- Comment ---------
     Name: b:1
-    From: wking <wking@thor.yang.physics.drexel.edu>
-    Date: Thu, 01 Jan 1970 00:00:01 +0000
+    From: ...
+    Date: ...
     <BLANKLINE>
     1 2
       --------- Comment ---------
       Name: b:2
-      From: wking <wking@thor.yang.physics.drexel.edu>
-      Date: Thu, 01 Jan 1970 00:00:02 +0000
+      From: ...
+      Date: ...
     <BLANKLINE>
       1 2 3 4
     --------- Comment ---------
     Name: b:3
-    From: wking <wking@thor.yang.physics.drexel.edu>
-    Date: Thu, 01 Jan 1970 00:00:03 +0000
+    From: ...
+    Date: ...
     <BLANKLINE>
     Merged into bug a
     >>> print b.status

diff --git a/becommands/show.py b/becommands/show.py
index 7c4825781ab821463ef2c1c743cb5967676517ac..4b0078f12693b84d11d14344c4195bad0fd7da07 100644 (file)
--- a/becommands/show.py
+++ b/becommands/show.py
@@ -23,7 +23,7 @@ def execute(args, test=False):
     >>> import os
     >>> bd = bugdir.simple_bug_dir()
     >>> os.chdir(bd.root)
-    >>> execute (["a",], test=True)
+    >>> execute (["a",], test=True) # doctest: +ELLIPSIS
               ID : a
       Short name : a
         Severity : minor
@@ -32,10 +32,10 @@ def execute(args, test=False):
           Target : 
         Reporter : 
          Creator : John Doe <jdoe@example.com>
-         Created : Wed, 31 Dec 1969 19:00 (Thu, 01 Jan 1970 00:00:00 +0000)
+         Created : ...
     Bug A
     <BLANKLINE>
-    >>> execute (["--xml", "a"], test=True)
+    >>> execute (["--xml", "a"], test=True) # doctest: +ELLIPSIS
     <bug>
       <uuid>a</uuid>
       <short-name>a</short-name>
@@ -45,7 +45,7 @@ def execute(args, test=False):
       <target><class 'libbe.settings_object.EMPTY'></target>
       <reporter><class 'libbe.settings_object.EMPTY'></reporter>
       <creator>John Doe <jdoe@example.com></creator>
-      <created>Wed, 31 Dec 1969 19:00 (Thu, 01 Jan 1970 00:00:00 +0000)</created>
+      <created>...</created>
       <summary>Bug A</summary>
     </bug>
     """