From: francois <francois@ctrlaltdel.ch>
Date: Fri, 14 Nov 2008 14:41:37 +0000 (-0700)
Subject: test_cli.py: use str objects instead of unicode ones
X-Git-Tag: allmydata-tahoe-1.3.0~425
X-Git-Url: https://git.rkrishnan.org/pf/content/COPYING.GPL?a=commitdiff_plain;h=32b5bc6330825870708764e546f4f6163ad4f914;p=tahoe-lafs%2Ftahoe-lafs.git

test_cli.py: use str objects instead of unicode ones

This will hopefully fix failing tests with LC_ALL=C
---

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index 4fa2e041..fb3edb05 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -550,11 +550,13 @@ class Cp(SystemTestMixin, CLITestMixin, unittest.TestCase):
     def test_unicode_filename(self):
         self.basedir = os.path.dirname(self.mktemp())
 
-        fn1 = os.path.join(self.basedir, u"Ärtonwall")
-        open(fn1, "wb").write("unicode file content")
+        fn1 = os.path.join(self.basedir, "Ärtonwall")
+        DATA1 = "unicode file content"
+        open(fn1, "wb").write(DATA1)
 
-        fn2 = os.path.join(self.basedir, u"Metallica")
-        open(fn2, "wb").write("non-unicode file content")
+        fn2 = os.path.join(self.basedir, "Metallica")
+        DATA2 = "non-unicode file content"
+        open(fn2, "wb").write(DATA2)
 
         # Bug #534
         # Assure that uploading a file whose name contains unicode character doesn't