Browse code

* run-tests.py: Don't assume utf-8, use preferred encoding instead.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@309 830e0280-6d2a-0410-9c65-932aecc39d9d

Michal Ludvig authored on 2008/12/31 11:47:20
Showing 2 changed files
... ...
@@ -1,5 +1,7 @@
1 1
 2008-12-31  Michal Ludvig  <michal@logix.cz>
2 2
 
3
+	* run-tests.py: Don't assume utf-8, use preferred encoding 
4
+	  instead.
3 5
 	* s3cmd, S3/Utils.py, S3/Exceptions.py, S3/Progress.py,
4 6
 	  S3/Config.py, S3/S3.py: Added --encoding switch and 
5 7
 	  Config.encoding variable. Don't assume utf-8 for filesystem
... ...
@@ -9,6 +11,14 @@
9 9
 
10 10
 2008-12-30  Michal Ludvig  <michal@logix.cz>
11 11
 
12
+	* Released version 0.9.9-pre4
13
+	  ---------------------------
14
+
15
+	* S3/PkgInfo.py: Bumped up version to 0.9.9-pre4
16
+	* NEWS: Updated.
17
+
18
+2008-12-30  Michal Ludvig  <michal@logix.cz>
19
+
12 20
 	* s3cmd: Replace unknown Unicode characters with '?'
13 21
 	  to avoid UnicodeEncodeError's. Also make all output strings
14 22
 	  unicode.
... ...
@@ -10,6 +10,7 @@ import sys
10 10
 import os
11 11
 import re
12 12
 from subprocess import Popen, PIPE, STDOUT
13
+import locale
13 14
 
14 15
 count_pass = 0
15 16
 count_fail = 0
... ...
@@ -33,7 +34,7 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],
33 33
 	def failure(message = ""):
34 34
 		global count_fail
35 35
 		if message:
36
-			message = "  (%s)" % message
36
+			message = "  (%r)" % message
37 37
 		print "\x1b[31;1mFAIL%s\x1b[0m" % (message)
38 38
 		count_fail += 1
39 39
 		print "----"
... ...
@@ -46,14 +47,14 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],
46 46
 	def success(message = ""):
47 47
 		global count_pass
48 48
 		if message:
49
-			message = "  (%s)" % message
49
+			message = "  (%r)" % message
50 50
 		print "\x1b[32;1mOK\x1b[0m%s" % (message)
51 51
 		count_pass += 1
52 52
 		return 0
53 53
 	def skip(message = ""):
54 54
 		global count_skip
55 55
 		if message:
56
-			message = "  (%s)" % message
56
+			message = "  (%r)" % message
57 57
 		print "\x1b[33;1mSKIP\x1b[0m%s" % (message)
58 58
 		count_skip += 1
59 59
 		return 0
... ...
@@ -62,7 +63,7 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],
62 62
 			_list = [_list]
63 63
 
64 64
 		if regexps == False:
65
-			_list = [re.escape(item.encode("utf-8")) for item in _list]
65
+			_list = [re.escape(item.encode(locale.getpreferredencoding(), "replace")) for item in _list]
66 66
 
67 67
 		return [re.compile(item, re.MULTILINE) for item in _list]
68 68