Fixed test suite for the unicode switch

diff --git a/becommands/assign.py b/becommands/assign.py
index d682130223d6f2025ed134201c0e7dc713498898..f3db6aae66a0d4b049e315e5ea3beddb28f2588d 100644 (file)
--- a/becommands/assign.py
+++ b/becommands/assign.py
@@ -31,7 +31,7 @@ def execute(args):
     True
     >>> execute(("a", "someone"))
     >>> dir.get_bug("a").assigned
-    'someone'
+    u'someone'
     >>> execute(("a","none"))
     >>> dir.get_bug("a").assigned is None
     True

diff --git a/becommands/close.py b/becommands/close.py
index 9d01a7f3b1e30a2d2ec257d3ea1038af07e6a176..04ae4ba012873cb8f9a969195cf314d8084f858e 100644 (file)
--- a/becommands/close.py
+++ b/becommands/close.py
@@ -23,10 +23,10 @@ def execute(args):
     >>> dir = tests.simple_bug_dir()
     >>> os.chdir(dir.dir)
     >>> dir.get_bug("a").status
-    'open'
+    u'open'
     >>> execute(("a",))
     >>> dir.get_bug("a").status
-    'closed'
+    u'closed'
     >>> tests.clean_up()
     """
     assert(len(args) == 1)

diff --git a/becommands/comment.py b/becommands/comment.py
index c53fd87bc18359afa06ba3c35f1851ec9f8aafa4..37fd37d63ee8b70512040de069a48eda2b18c488 100644 (file)
--- a/becommands/comment.py
+++ b/becommands/comment.py
@@ -26,7 +26,7 @@ def execute(args):
     >>> execute(["a", "This is a comment about a"])
     >>> comment = dir.get_bug("a").list_comments()[0]
     >>> comment.body
-    'This is a comment about a\\n'
+    u'This is a comment about a\\n'
     >>> comment.From == names.creator()
     True
     >>> comment.date <= int(time.time())
@@ -40,7 +40,7 @@ def execute(args):
     >>> os.environ["EDITOR"] = "echo 'I like cheese' > "
     >>> execute(["b"])
     >>> dir.get_bug("b").list_comments()[0].body
-    'I like cheese\\n'
+    u'I like cheese\\n'
     >>> tests.clean_up()
     """
     options, args = get_parser().parse_args(args)

diff --git a/becommands/inprogress.py b/becommands/inprogress.py
index 5b9f7674be1073da0d1628ede45cb5ff1c35197a..214efa1bc873baeb06e159a9eb91b5c0e775c587 100644 (file)
--- a/becommands/inprogress.py
+++ b/becommands/inprogress.py
@@ -23,10 +23,10 @@ def execute(args):
     >>> dir = tests.simple_bug_dir()
     >>> os.chdir(dir.dir)
     >>> dir.get_bug("a").status
-    'open'
+    u'open'
     >>> execute(("a",))
     >>> dir.get_bug("a").status
-    'in-progress'
+    u'in-progress'
     >>> tests.clean_up()
     """
     assert(len(args) == 1)

diff --git a/becommands/new.py b/becommands/new.py
index f16306d1051347c4661eb6cc29336cccb139acb4..7bd2382cd57b52471440375c43e59025b4ec7f66 100644 (file)
--- a/becommands/new.py
+++ b/becommands/new.py
@@ -27,12 +27,12 @@ def execute(args):
     Created bug with ID a
     >>> bug = list(dir.list())[0]
     >>> bug.summary
-    'this is a test'
+    u'this is a test'
     >>> bug.creator = os.environ["LOGNAME"]
     >>> bug.time <= int(time.time())
     True
     >>> bug.severity
-    'minor'
+    u'minor'
     >>> bug.target == None
     True
     >>> tests.clean_up()

diff --git a/becommands/open.py b/becommands/open.py
index 792309182114144a5bd347fe4de5a3e1c1878b56..19b891090c00bc537fc6ea0bc546c0aec1aa23a1 100644 (file)
--- a/becommands/open.py
+++ b/becommands/open.py
@@ -23,10 +23,10 @@ def execute(args):
     >>> dir = tests.simple_bug_dir()
     >>> os.chdir(dir.dir)
     >>> dir.get_bug("b").status
-    'closed'
+    u'closed'
     >>> execute(("b",))
     >>> dir.get_bug("b").status
-    'open'
+    u'open'
     >>> tests.clean_up()
     """
     assert(len(args) == 1)

diff --git a/libbe/mapfile.py b/libbe/mapfile.py
index bbbd860a24f7cb3d85b386b9213b985add54064b..6a304fdad6a14f921124208cbd30d0b0ed298a17 100644 (file)
--- a/libbe/mapfile.py
+++ b/libbe/mapfile.py
@@ -75,18 +75,18 @@ def parse(f):
     """
     Parse a format-2 mapfile.
     >>> parse('\\n\\n\\nq=p\\n\\n\\n\\n')['q']
-    'p'
+    u'p'
     >>> parse('\\n\\nq=\\'p\\'\\n\\n\\n\\n')['q']
-    "\'p\'"
+    u"\'p\'"
     >>> f = utility.FileString()
     >>> generate(f, {"a":"b", "c":"d", "e":"f"})
     >>> dict = parse(f)
     >>> dict["a"]
-    'b'
+    u'b'
     >>> dict["c"]
-    'd'
+    u'd'
     >>> dict["e"]
-    'f'
+    u'f'
     """
     f = utility.get_file(f)
     result = {}