commit d9cabb5514bf23c16a963c7586acbf7a9f4a2a9f
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 21 14:20:11 2014 +0200
py3k: try to fix "AttributeError: 'str' object has no attribute 'decode'"
This is an ugly hack, there must be a better way...
java-utils/builddep.py | 6 +++++-
java-utils/mvn_alias.py | 6 +++++-
java-utils/mvn_artifact.py | 6 +++++-
java-utils/mvn_build.py | 6 +++++-
java-utils/mvn_compat_version.py | 6 +++++-
java-utils/mvn_config.py | 6 +++++-
java-utils/mvn_file.py | 6 +++++-
java-utils/mvn_package.py | 6 +++++-
8 files changed, 40 insertions(+), 8 deletions(-)
---
diff --git a/java-utils/builddep.py b/java-utils/builddep.py
index 62782e3..12a2bc0 100644
--- a/java-utils/builddep.py
+++ b/java-utils/builddep.py
@@ -52,7 +52,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) != 1:
diff --git a/java-utils/mvn_alias.py b/java-utils/mvn_alias.py
index d6e135e..7a1c7cf 100644
--- a/java-utils/mvn_alias.py
+++ b/java-utils/mvn_alias.py
@@ -63,7 +63,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) < 2:
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index d9c471a..48f5861 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -246,7 +246,11 @@ if __name__ == "__main__":
parser.add_option("-D", action="append", type="str",
help="add artifact property", metavar="property=value")
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) < 1:
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index 96c0bbb..c6e0e25 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -93,7 +93,11 @@ if __name__ == "__main__":
help="Enable Maven debugging output (implies -d).")
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
xc = XMvnConfig()
diff --git a/java-utils/mvn_compat_version.py b/java-utils/mvn_compat_version.py
index 3f94717..b061b3b 100644
--- a/java-utils/mvn_compat_version.py
+++ b/java-utils/mvn_compat_version.py
@@ -63,7 +63,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) < 2:
diff --git a/java-utils/mvn_config.py b/java-utils/mvn_config.py
index 6d3287f..d847bbf 100644
--- a/java-utils/mvn_config.py
+++ b/java-utils/mvn_config.py
@@ -59,7 +59,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) != 2:
diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py
index e5b3241..3bd4c19 100644
--- a/java-utils/mvn_file.py
+++ b/java-utils/mvn_file.py
@@ -63,7 +63,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()
if len(args) < 2:
diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
index 4f80a81..0103e9e 100644
--- a/java-utils/mvn_package.py
+++ b/java-utils/mvn_package.py
@@ -63,7 +63,11 @@ if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
for index, arg in enumerate(sys.argv):
- sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ try:
+ if callable(getattr(arg, "decode")):
+ sys.argv[index] = arg.decode(sys.getfilesystemencoding())
+ except AttributeError:
+ pass
(options, args) = parser.parse_args()