Merge pull request #44 from sundeep-co-in/STAGE

ZNTA-946: zanata push StringIO fix

CHANGELOG

@@ -1,4 +1,6 @@
-* Web Mar 02 2016 Sundeep Anand <[email protected]>
+* Web Apr 13 2016 Sundeep Anand <[email protected]> - 1.5.0
+- ZNTA-946 - zanata push StringIO fix
+- ZNTA-303 - podir projects handling
 - ZNTA-936 - redirection 301, 302 handling
 - ZNTA-934 - java-client compatible zanata.xml
 - ZNTA-927 - Project Status and Versions

zanataclient/zanatalib/projectutils.py

@@ -198,6 +198,8 @@ def _process_map_path(self, map_path):
         subdirectory = map_path[:map_path.rfind('/')]
         if subdirectory and not os.path.isdir(subdirectory):
             os.makedirs(subdirectory)
+        if '//' in map_path:
+            map_path = map_path.replace('//', '/')
         return map_path
 
     def _apply_standard_mapping_rules(self):

zanataclient/zanatalib/rest/client.py

@@ -30,7 +30,10 @@
 import os
 import sys
 import warnings
-from io import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 warnings.simplefilter("ignore", DeprecationWarning)
 import httplib2