Merge pull request fmauch#4 from sjahr/master

Add python3 compatibility

Author: fmauch

package.xml

@@ -52,6 +52,7 @@
   <exec_depend>python-yaml</exec_depend>
   <exec_depend>rospy</exec_depend>
   <exec_depend>tmux</exec_depend>
+  <exec_depend>future</exec_depend>
 
   <!-- The export tag contains other, unspecified, tags -->
   <export>

src/catmux/__init__.py

@@ -19,6 +19,7 @@
 # -- END LICENSE BLOCK ------------------------------------------------
 
 """Loads all modules from other files"""
+from __future__ import absolute_import
 
-from window import Window
-from session import Session
+from catmux.window import Window
+from catmux.session import Session

src/catmux/session.py

@@ -19,13 +19,13 @@
 # -- END LICENSE BLOCK ------------------------------------------------
 
 """Contains everything around the config file"""
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 
 import re
 import yaml
 
-from window import Window
-import tmux_wrapper as tmux
+from catmux.window import Window
+import catmux.tmux_wrapper as tmux
 
 
 def check_boolean_field(boolean):
@@ -52,7 +52,7 @@ def init_from_filepath(self, filepath):
         """Initializes the data from a file read from filepath."""
 
         try:
-            self.__yaml_data = yaml.load(file(filepath, 'r'))
+            self.__yaml_data = yaml.load(open(filepath, 'r'))
         except yaml.YAMLError as exc:
             print('Error while loading config file: %s', exc)
             print('Loaded file was: %s', filepath)
@@ -114,11 +114,11 @@ def _parse_parameters(self):
 
         print('Parameters found in session config:')
         print(' - ' + '\n - '.join('{} = {}'.format(key, value)
-                                   for key, value in self._parameters.items()))
+                                   for key, value in list(self._parameters.items())))
         if self._runtime_params:
             print('Parameters found during runtime (overwrites):')
             print(' - ' + '\n - '.join('{} = {}'.format(key, value)
-                                       for key, value in self._runtime_params.items()))
+                                       for key, value in list(self._runtime_params.items())))
             # Overwrite parameters given from command line
             self._parameters.update(self._runtime_params)
 
@@ -127,13 +127,13 @@ def _parse_parameters(self):
 
     def _replace_parameters(self, data):
         if isinstance(data, dict):
-            for key, value in data.items():
+            for key, value in list(data.items()):
                 data[key] = self._replace_parameters(value)
         elif isinstance(data, list):
             for index, item in enumerate(data):
                 data[index] = self._replace_parameters(item)
         elif isinstance(data, str):
-            for key, value in self._parameters.items():
+            for key, value in list(self._parameters.items()):
                 # print('-\nValue {}: {}\n='.format(value, type(data)))
                 # if isinstance(value, str):
                 # print('replacing {} in {}'.format(key, data))

src/catmux/split.py

@@ -19,9 +19,11 @@
 # -- END LICENSE BLOCK ------------------------------------------------
 
 """A split in a tmux session"""
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 
-import tmux_wrapper as tmux
+from future.utils import iteritems
+
+import catmux.tmux_wrapper as tmux
 
 
 class Split(object):
@@ -32,7 +34,7 @@ def __init__(self, **kwargs):
         """TODO: to be defined1. """
 
         if kwargs is not None:
-            for key, value in kwargs.iteritems():
+            for (key, value) in iteritems(kwargs):
                 setattr(self, key, value)
 
     def debug(self, name='', prefix=''):

src/catmux/window.py

@@ -19,12 +19,14 @@
 # -- END LICENSE BLOCK ------------------------------------------------
 
 """Contains the Window object"""
-from __future__ import print_function
+from __future__ import print_function, absolute_import
+
+from future.utils import iteritems
 
 import time
 
-import tmux_wrapper as tmux
-from split import Split
+import catmux.tmux_wrapper as tmux
+from catmux.split import Split
 
 
 class Window(object):
@@ -45,7 +47,7 @@ def __init__(self, **kwargs):
             self.splits.append(Split(**split_data))
 
         if kwargs is not None:
-            for key, value in kwargs.iteritems():
+            for (key, value) in iteritems (kwargs):
                 setattr(self, key, value)