Skip to content
Snippets Groups Projects
Commit b957ef79 authored by Anne Philipp's avatar Anne Philipp
Browse files

python2 downgrade/ manually select EMOSLIB instead of MIR

parent 8bcf3ecf
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env python3 #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#******************************************************************************* #*******************************************************************************
# @Author: Anne Fouilloux (University of Oslo) # @Author: Anne Fouilloux (University of Oslo)
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# MODULES # MODULES
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
from __future__ import print_function
import os import os
import sys import sys
import subprocess import subprocess
...@@ -483,6 +485,8 @@ class MarsRetrieval(object): ...@@ -483,6 +485,8 @@ class MarsRetrieval(object):
for key in empty_keys: for key in empty_keys:
del attrs[key] del attrs[key]
attrs['ppengine'] = 'emos'
# MARS request via Python script # MARS request via Python script
if self.server: if self.server:
try: try:
...@@ -513,7 +517,7 @@ class MarsRetrieval(object): ...@@ -513,7 +517,7 @@ class MarsRetrieval(object):
for key, value in attrs.items(): for key, value in attrs.items():
request_str = request_str + ',' + key + '=' + str(value) request_str = request_str + ',' + key + '=' + str(value)
request_str += ',target="' + target + '"' request_str += ',target="' + target + '"'
p = subprocess.Popen(['mars'], p = subprocess.Popen(['mars', '-e'],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment