From 266806a6f09fab517aaa1795e5aee1700686eab0 Mon Sep 17 00:00:00 2001
From: Sylvain Marty <smarty@cls.fr>
Date: Wed, 31 Oct 2018 14:25:28 +0100
Subject: [PATCH 1/5] [ant-gitflow] updated pom.xml for next development
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cf4bc95..fa0df43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motuclient-python</artifactId>
- <version>1.8.00-SNAPSHOT</version>
+ <version>1.9.00-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Motu Client Python</name>
From dcf29274aa2e5e7ec2dfac831c750a90fb84adc4 Mon Sep 17 00:00:00 2001
From: Sylvain Marty <smarty@cls.fr>
Date: Wed, 31 Oct 2018 14:26:31 +0100
Subject: [PATCH 2/5] [ant-gitflow] updated pom.xml to avoid conflict merging
with develop
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cf4bc95..fa0df43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motuclient-python</artifactId>
- <version>1.8.00-SNAPSHOT</version>
+ <version>1.9.00-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Motu Client Python</name>
From be09debdeb2310e7920e0d276d4cb803ee29fc60 Mon Sep 17 00:00:00 2001
From: Sylvain Marty <smarty@cls.fr>
Date: Wed, 31 Oct 2018 15:39:27 +0100
Subject: [PATCH 3/5] Fix version 1.8.1
---
README.md | 10 ++++++++--
pom.xml | 2 +-
src/python/motu_utils/utils_stream.py | 7 +++++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index d638dec..f288603 100644
--- a/README.md
+++ b/README.md
@@ -145,9 +145,15 @@ socket_timeout=
Starts the motu python client.
## <a name="UsagePIP">Usage from PIP installation</a>
+Since version 1.8.0:
```
-python -m motuclient -h
-python -m motuclient [options]
+motuclient -h
+motuclient [options]
+```
+Before version 1.8.0:
+```
+python -m motu-client -h
+python -m motu-client [options]
```
[Options](#UsageOptions) are listed below.
diff --git a/pom.xml b/pom.xml
index fa0df43..0ae3738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motuclient-python</artifactId>
- <version>1.9.00-SNAPSHOT</version>
+ <version>1.8.1</version>
<packaging>pom</packaging>
<name>Motu Client Python</name>
diff --git a/src/python/motu_utils/utils_stream.py b/src/python/motu_utils/utils_stream.py
index a857492..27680c6 100644
--- a/src/python/motu_utils/utils_stream.py
+++ b/src/python/motu_utils/utils_stream.py
@@ -25,7 +25,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-import io
+import io, sys
def copy(sourceHandler, destHandler, callback = None, blockSize = 65535 ):
"""Copy the available content through the given handler to another one. Process
@@ -50,7 +50,10 @@ def copy(sourceHandler, destHandler, callback = None, blockSize = 65535 ):
try:
if type(destHandler) == io.StringIO:
strBlock=str(block)
- destHandler.write( unicode(block, 'utf-8') )
+ if sys.version_info > (3, 0):
+ destHandler.write( str(block, 'utf-8') )
+ else:
+ destHandler.write( unicode(block, 'utf-8') )
else:
destHandler.write(block)
except Exception as inst:
From 3a58240f2ab444a3d8d8ddeb1f9be1188db4b19e Mon Sep 17 00:00:00 2001
From: Sylvain Marty <smarty@cls.fr>
Date: Wed, 31 Oct 2018 15:40:04 +0100
Subject: [PATCH 4/5] [ant-gitflow] updated pom.xml for next development
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0ae3738..fa0df43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motuclient-python</artifactId>
- <version>1.8.1</version>
+ <version>1.9.00-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Motu Client Python</name>
From e50daa19f89a08cf1c7d69612c7f9738f94153e4 Mon Sep 17 00:00:00 2001
From: Sylvain Marty <smarty@cls.fr>
Date: Wed, 31 Oct 2018 15:41:58 +0100
Subject: [PATCH 5/5] Fix v1.8.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fa0df43..4740112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motuclient-python</artifactId>
- <version>1.9.00-SNAPSHOT</version>
+ <version>1.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Motu Client Python</name>