Merge pull request #136 from gchq/gh-20-travis-python

Gh 20 travis python
gchq · Jun 28, 2017 · 46fb460 · 46fb460
2 parents 404367c + 1c2c5d0
commit 46fb460
Show file tree

Hide file tree

Showing 2 changed files with 1,561 additions and 11 deletions.
diff --git a/python-shell/src/gafferpy/gaffer.py b/python-shell/src/gafferpy/gaffer.py
@@ -486,8 +486,8 @@ def to_json(self):
 
         element_generator = {'class': self.generator_class_name}
         if self.element_generator_fields is not None:
-            for field in self.element_generator_fields:
-                element_generator[field.key] = field.value
+            for key, value in self.element_generator_fields.items():
+                element_generator[key] = value
         operation['elementGenerator'] = element_generator
         return operation
 
@@ -518,8 +518,8 @@ def to_json(self):
 
         element_generator = {'class': self.generator_class_name}
         if self.element_generator_fields is not None:
-            for field in self.element_generator_fields:
-                element_generator[field.key] = field.value
+            for key, value in self.element_generator_fields.items():
+                element_generator[key] = value
         operation['elementGenerator'] = element_generator
         return operation