commit 78e2fed073a7c479c40723b97338da27f62c6b4b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 27 07:59:11 2013 +0200
Use unicode internally
java-utils/mvn_alias.py | 3 +++
java-utils/mvn_build.py | 3 +++
java-utils/mvn_config.py | 5 +++++
java-utils/mvn_file.py | 3 +++
java-utils/mvn_package.py | 3 +++
python/javapackages/xmvn_config.py | 3 ++-
6 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/mvn_alias.py b/java-utils/mvn_alias.py
index fd008d9..ca4840e 100644
--- a/java-utils/mvn_alias.py
+++ b/java-utils/mvn_alias.py
@@ -60,6 +60,9 @@ commons-lang:commons-lang:war:test-jar:3.1
if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
+ for index, arg in enumerate(sys.argv):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+
(options, args) = parser.parse_args()
if len(args) < 2:
parser.error("At least 2 arguments are required")
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index 3ec33ec..719b47d 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -87,6 +87,9 @@ if __name__ == "__main__":
action="store_true",
help="Enable Maven debugging output (implies -d).")
+ for index, arg in enumerate(sys.argv):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+
(options, args) = parser.parse_args()
xc = XMvnConfig()
env = os.environ
diff --git a/java-utils/mvn_config.py b/java-utils/mvn_config.py
index 2172faf..d24729f 100644
--- a/java-utils/mvn_config.py
+++ b/java-utils/mvn_config.py
@@ -30,7 +30,9 @@
#
# Authors: Stanislav Ochotnicky <sochotnicky(a)redhat.com
+import sys
import optparse
+
from javapackages.xmvn_config import XMvnConfig
class SaneParser(optparse.OptionParser):
@@ -57,6 +59,9 @@ commons-lang:commons-lang:war:test-jar:3.1
if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
+ for index, arg in enumerate(sys.argv):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+
(options, args) = parser.parse_args()
if len(args) != 2:
parser.error("Exactly 2 arguments are required")
diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py
index dc8ab2d..3226001 100644
--- a/java-utils/mvn_file.py
+++ b/java-utils/mvn_file.py
@@ -60,6 +60,9 @@ commons-lang:commons-lang:war:test-jar:3.1
if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
+ for index, arg in enumerate(sys.argv):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+
(options, args) = parser.parse_args()
if len(args) < 2:
parser.error("At least 2 arguments are required")
diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
index 473b8ad..86b2035 100644
--- a/java-utils/mvn_package.py
+++ b/java-utils/mvn_package.py
@@ -60,6 +60,9 @@ commons-lang:commons-lang:war:test-jar:3.1
if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
+ for index, arg in enumerate(sys.argv):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+
(options, args) = parser.parse_args()
if len(args) != 2:
parser.error("Exactly 2 arguments are required")
diff --git a/python/javapackages/xmvn_config.py b/python/javapackages/xmvn_config.py
index afd6624..a07490c 100644
--- a/python/javapackages/xmvn_config.py
+++ b/python/javapackages/xmvn_config.py
@@ -30,6 +30,7 @@
#
# Authors: Stanislav Ochotnicky <sochotnicky(a)redhat.com
+import codecs
import os
from StringIO import StringIO
import xml.dom.minidom
@@ -95,7 +96,7 @@ class XMvnConfig(object):
def __write_xml(self, path, root):
xmlstr = self.__prettify_element(root)
- with open(path, 'w+') as fout:
+ with codecs.open(path, 'w+', "utf-8") as fout:
fout.write(xmlstr)
Show replies by date