Small bug fixettes to PCLrun and PCLc

3 files changed, 6 insertions, 7 deletions

diff --git a/src/pcl-run/pcl-run.py b/src/pcl-run/pcl-run.py
index 8a3d2fb..674e9d6 100755
--- a/src/pcl-run/pcl-run.py
+++ b/src/pcl-run/pcl-run.py
@@ -26,7 +26,7 @@ from optparse import OptionParser
 from runner.runner import PCLImportError, execute_module
 
 
-__VERSION = "1.2.0"
+__VERSION = "1.2.1"
 
 
 if __name__ == '__main__':
@@ -117,7 +117,7 @@ if __name__ == '__main__':
     config_parser.read(config_filename)
 
     # Read the configuration from the configuration file
-    def get_configuration(expected_configurations):
+    def get_configuration_values(expected_configurations):
         configuration = dict()
         configuration_errors = list()
         for config_key in expected_configurations:
@@ -135,7 +135,7 @@ if __name__ == '__main__':
         return configuration
 
     # Read the inputs from the configuration file
-    def get_inputs(expected_inputs):
+    def get_input_values(expected_inputs):
         # Create inputs
         def build_inputs_fn(inputs):
             input_dict = dict()
@@ -157,8 +157,8 @@ if __name__ == '__main__':
         print >> sys.stderr, execute_module(pcl_import_path,
                                             pcl_module,
                                             options.no_workers,
-                                            get_configuration,
-                                            get_inputs)[1]
+                                            get_configuration_values,
+                                            get_input_values)[1]
     except PCLImportError as ex:
         print >> sys.stderr, "ERROR: Failed to import PCL module %s: %s" % (pcl_module, ex)
         sys.exit(1)
diff --git a/src/pclc/pclc.py b/src/pclc/pclc.py
index 7ee82e8..83c55c3 100755
--- a/src/pclc/pclc.py
+++ b/src/pclc/pclc.py
@@ -27,7 +27,7 @@ from parser.resolver import Resolver
 from visitors.executor_visitor import ExecutorVisitor
 
 
-__VERSION = "1.1.2"
+__VERSION = "1.1.3"
 
 
 if __name__ == '__main__':
diff --git a/src/pclc/visitors/first_pass_resolver_visitor.py b/src/pclc/visitors/first_pass_resolver_visitor.py
index b7c17e6..8f6df5a 100644
--- a/src/pclc/visitors/first_pass_resolver_visitor.py
+++ b/src/pclc/visitors/first_pass_resolver_visitor.py
@@ -226,7 +226,6 @@ class FirstPassResolverVisitor(ResolverVisitor):
                                                          'configure',
                                                          'initialise'])
             except Exception as ie:
-                print str(ie), type(ie)
                 self._add_errors("ERROR: %(filename)s at line %(lineno)d, error importing " \
                                  "module %(module_name)s: %(exception)s",
                                  [an_import],