X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fmanifolduploader.py;h=f40e2aaf1d1bb26b7ce8bab3b1a18613aa289dfc;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=e377c8d7ebd70e8b29c13822cbe251ff62a5717a;hpb=0a9902d2a55a0a9ac03601345c4284293669012b;p=sfa.git

diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py
index e377c8d7..f40e2aaf 100755
--- a/sfa/client/manifolduploader.py
+++ b/sfa/client/manifolduploader.py
@@ -52,7 +52,7 @@ class ManifoldUploader:
 
     def username(self):
         if not self._username:
-            self._username = raw_input("Enter your manifold username: ")
+            self._username = input("Enter your manifold username: ")
         return self._username
 
     def password(self):
@@ -64,7 +64,7 @@ class ManifoldUploader:
 
     def platform(self):
         if not self._platform:
-            self._platform = raw_input(
+            self._platform = input(
                 "Enter your manifold platform [%s]: " % DEFAULT_PLATFORM)
             if self._platform.strip() == "":
                 self._platform = DEFAULT_PLATFORM
@@ -72,7 +72,7 @@ class ManifoldUploader:
 
     def url(self):
         if not self._url:
-            self._url = raw_input(
+            self._url = input(
                 "Enter the URL for your manifold API [%s]: " % DEFAULT_URL)
             if self._url.strip() == "":
                 self._url = DEFAULT_URL
@@ -146,7 +146,7 @@ class ManifoldUploader:
             self.logger.info("  V2 Update returned code %s and error >>%s<<" % (
                 retcod2['code'], retcod2['description']))
             self.logger.debug("****** full retcod2")
-            for k, v in retcod2.items():
+            for k, v in list(retcod2.items()):
                 self.logger.debug("**** %s: %s" % (k, v))
             return False
         except Exception as e:
@@ -169,17 +169,22 @@ def main():
                         help="the filenames to upload")
     parser.add_argument('-u', '--url', dest='url', action='store', default=None,
                         help='the URL of the manifold API')
-    parser.add_argument('-p', '--platform', dest='platform', action='store', default=None,
+    parser.add_argument('-p', '--platform', dest='platform',
+                        action='store', default=None,
                         help='the manifold platform name')
-    parser.add_argument('-U', '--user', dest='username', action='store', default=None,
+    parser.add_argument('-U', '--user', dest='username',
+                        action='store', default=None,
                         help='the manifold username')
-    parser.add_argument('-P', '--password', dest='password', action='store', default=None,
+    parser.add_argument('-P', '--password', dest='password',
+                        action='store', default=None,
                         help='the manifold password')
-    parser.add_argument('-v', '--verbose', dest='verbose', action='count', default=0,
+    parser.add_argument('-v', '--verbose', dest='verbose',
+                        action='count', default=0,
                         help='more and more verbose')
     args = parser.parse_args()
 
-    from sfa.util.sfalogging import sfi_logger
+    from sfa.util.sfalogging import init_logger, logger as sfi_logger
+    init_logger('console')
     sfi_logger.enable_console()
     sfi_logger.setLevelFromOptVerbose(args.verbose)
     uploader = ManifoldUploader(url=args.url, platform=args.platform,