From acc8eeadb0dd3655b42bdac11d55b413fcfc9d33 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Mon, 20 Jun 2016 02:01:30 +0200
Subject: [PATCH] python3: futurize step1

---
 parser/parser-cp2k/cp2kparser/scalainterface.py            | 3 ++-
 parser/parser-cp2k/cp2kparser/tools/xmlpreparser.py        | 3 ++-
 .../cp2kparser/versions/cp2k262/commonmatcher.py           | 3 ++-
 .../cp2kparser/versions/cp2k262/geooptparser.py            | 6 ++++--
 parser/parser-cp2k/cp2kparser/versions/cp2k262/mdparser.py | 7 ++++---
 .../cp2kparser/versions/cp2k262/singlepointparser.py       | 5 +++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/parser/parser-cp2k/cp2kparser/scalainterface.py b/parser/parser-cp2k/cp2kparser/scalainterface.py
index 528e1c5..3c9e67c 100644
--- a/parser/parser-cp2k/cp2kparser/scalainterface.py
+++ b/parser/parser-cp2k/cp2kparser/scalainterface.py
@@ -2,8 +2,9 @@
 This is the access point to the parser for the scala layer in the
 nomad project.
 """
+from __future__ import absolute_import
 import sys
-import setup_paths
+from . import setup_paths
 from nomadcore.parser_backend import JsonParseEventsWriterBackend
 from cp2kparser import CP2KParser
 
diff --git a/parser/parser-cp2k/cp2kparser/tools/xmlpreparser.py b/parser/parser-cp2k/cp2kparser/tools/xmlpreparser.py
index 06bcbc8..3f6f02b 100644
--- a/parser/parser-cp2k/cp2kparser/tools/xmlpreparser.py
+++ b/parser/parser-cp2k/cp2kparser/tools/xmlpreparser.py
@@ -12,6 +12,7 @@ The actual calculation input contents can later be added to this object. Then
 the object can be queried for the results, or the default values defined by the
 cp2k_input.xml.
 """
+from __future__ import print_function
 
 import xml.etree.cElementTree as ET
 import logging
@@ -68,7 +69,7 @@ def recursive_tree_generation(xml_element, for_metainfo=False, name_stack=[], ig
             ]
             name = "/".join(name_stack)
             if "/".join(name_stack) in kept_print_settings:
-                print "KEPT {}".format(name)
+                print("KEPT {}".format(name))
                 ignore = False
             else:
                 return
diff --git a/parser/parser-cp2k/cp2kparser/versions/cp2k262/commonmatcher.py b/parser/parser-cp2k/cp2kparser/versions/cp2k262/commonmatcher.py
index e2e2b14..dece149 100644
--- a/parser/parser-cp2k/cp2kparser/versions/cp2k262/commonmatcher.py
+++ b/parser/parser-cp2k/cp2kparser/versions/cp2k262/commonmatcher.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import re
 import numpy as np
 import logging
@@ -5,7 +6,7 @@ from nomadcore.simple_parser import SimpleMatcher as SM
 from nomadcore.simple_parser import extractOnCloseTriggers
 from nomadcore.caching_backend import CachingLevel
 from nomadcore.unit_conversion.unit_conversion import convert_unit
-from inputparser import CP2KInputParser
+from .inputparser import CP2KInputParser
 logger = logging.getLogger("nomad")
 
 
diff --git a/parser/parser-cp2k/cp2kparser/versions/cp2k262/geooptparser.py b/parser/parser-cp2k/cp2kparser/versions/cp2k262/geooptparser.py
index f1a9c00..8a8db07 100644
--- a/parser/parser-cp2k/cp2kparser/versions/cp2k262/geooptparser.py
+++ b/parser/parser-cp2k/cp2kparser/versions/cp2k262/geooptparser.py
@@ -1,6 +1,8 @@
+from __future__ import print_function
+from __future__ import absolute_import
 from nomadcore.simple_parser import SimpleMatcher as SM
 from nomadcore.baseclasses import MainHierarchicalParser
-from commonmatcher import CommonMatcher
+from .commonmatcher import CommonMatcher
 import cp2kparser.generic.configurationreading
 import cp2kparser.generic.csvparsing
 from nomadcore.caching_backend import CachingLevel
@@ -303,5 +305,5 @@ class CP2KGeoOptParser(MainHierarchicalParser):
 
     def debug(self):
         def wrapper(parser):
-            print "DEBUG"
+            print("DEBUG")
         return wrapper
diff --git a/parser/parser-cp2k/cp2kparser/versions/cp2k262/mdparser.py b/parser/parser-cp2k/cp2kparser/versions/cp2k262/mdparser.py
index cca527c..c87434f 100644
--- a/parser/parser-cp2k/cp2kparser/versions/cp2k262/mdparser.py
+++ b/parser/parser-cp2k/cp2kparser/versions/cp2k262/mdparser.py
@@ -1,7 +1,8 @@
+from __future__ import absolute_import
 import numpy as np
 from nomadcore.simple_parser import SimpleMatcher as SM
 from nomadcore.baseclasses import MainHierarchicalParser
-from commonmatcher import CommonMatcher
+from .commonmatcher import CommonMatcher
 import cp2kparser.generic.configurationreading
 import cp2kparser.generic.csvparsing
 from nomadcore.caching_backend import CachingLevel
@@ -296,7 +297,7 @@ class CP2KMDParser(MainHierarchicalParser):
             # Energy file
             if self.energy_iterator is not None:
                 if (i_step + 1) % freqs["energies"][0] == 0:
-                    line = self.energy_iterator.next()
+                    line = next(self.energy_iterator)
 
                     time = line[1]
                     kinetic_energy = line[2]
@@ -317,7 +318,7 @@ class CP2KMDParser(MainHierarchicalParser):
             # Cell file
             if self.cell_iterator is not None:
                 if (i_step + 1) % freqs["cell"][0] == 0:
-                    line = self.cell_iterator.next()
+                    line = next(self.cell_iterator)
                     cell = np.reshape(line, (3, 3))
                     self.cache_service["simulation_cell"] = cell
 
diff --git a/parser/parser-cp2k/cp2kparser/versions/cp2k262/singlepointparser.py b/parser/parser-cp2k/cp2kparser/versions/cp2k262/singlepointparser.py
index 0a90533..cfd9e7a 100644
--- a/parser/parser-cp2k/cp2kparser/versions/cp2k262/singlepointparser.py
+++ b/parser/parser-cp2k/cp2kparser/versions/cp2k262/singlepointparser.py
@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 from nomadcore.simple_parser import SimpleMatcher as SM
 from nomadcore.baseclasses import MainHierarchicalParser
-from singlepointforceparser import CP2KSinglePointForceParser
+from .singlepointforceparser import CP2KSinglePointForceParser
 from nomadcore.caching_backend import CachingLevel
-from commonmatcher import CommonMatcher
+from .commonmatcher import CommonMatcher
 import logging
 logger = logging.getLogger("nomad")
 
-- 
GitLab