Changeset 79729d5 in flex_extract.git for source/python/classes/MarsRetrieval.py

Timestamp:

Mar 8, 2019, 4:07:28 PM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

d727af2

Parents:

82c2959

Message:

switched from python2 to python3

File:

• source/python/classes/MarsRetrieval.py (modified) (5 diffs)

source/python/classes/MarsRetrieval.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
@@ -434 +434 @@
             f.write(str(request_number) + ', ')
             f.write(', '.join(str(attrs[key])
-                              for key in sorted(attrs.iterkeys())))
+                              for key in sorted(attrs.keys())))
             f.write('\n')
 
@@ -474 +474 @@
         # find all keys without a value and convert all other values to strings
         empty_keys = []
-        for key, value in attrs.iteritems():
+        for key, value in attrs.items():
             if value == '':
                 empty_keys.append(str(key))
@@ -511 +511 @@
         else:
             request_str = 'ret'
-            for key, value in attrs.iteritems():
+            for key, value in attrs.items():
                 request_str = request_str + ',' + key + '=' + str(value)
             request_str += ',target="' + target + '"'
@@ -519 +519 @@
                                  stderr=subprocess.PIPE,
                                  bufsize=1)
-            pout = p.communicate(input=request_str)[0]
+            pout = p.communicate(input=request_str.encode())[0]
             print(pout.decode())