Add a safer type conversion and using repr instead of deprecated backquotes

Author: aficionado

bigml/fields.py

@@ -24,12 +24,23 @@
 import sys
 from bigml.util import invert_dictionary
 
-type_map = {
+TYPE_MAP = {
     "categorical": str,
     "numeric": float,
     "text": str
 }
 
+
+def map_type(value):
+    """Maps a BigML type to a Python type.
+
+    """
+    if value in TYPE_MAP:
+        return TYPE_MAP[value]
+    else:
+        return str
+
+
 class Fields(object):
     """A class to deal with BigML auto-generated ids.
 
@@ -94,17 +105,17 @@ def pair(self, row, objective_field=None, objective_field_present=None):
             if objective_field_present:
                 if index != objective_field:
                     pair.update({self.field_id(index):
-                        type_map[self.fields[self.field_id(index)]['optype']]
-                            (row[index])})
+                                map_type(self.fields[self.field_id(index)]
+                                         ['optype'])(row[index])})
             else:
                 if index >= objective_field:
                     pair.update({self.field_id(index + 1):
-                        type_map[self.fields[self.field_id(index +
-                            1)]['optype']](row[index])})
+                                map_type(self.fields[self.field_id(index + 1)]
+                                         ['optype'])(row[index])})
                 else:
                     pair.update({self.field_id(index):
-                        type_map[self.fields[self.field_id(index)]['optype']]
-                            (row[index])})
+                                map_type(self.fields[self.field_id(index)]
+                                         ['optype'])(row[index])})
 
         return pair
 

bigml/model.py

@@ -56,7 +56,6 @@
 
 from bigml.api import FINISHED
 from bigml.util import invert_dictionary, slugify, split
-from bigml.fields import type_map
 
 # Map operator str to its corresponding function
 OPERATOR = {
@@ -238,10 +237,10 @@ def python_body(self, depth=1, cmv=False):
                         (INDENT * depth,
                          self.fields[child.predicate.field]['slug'],
                          PYTHON_OPERATOR[child.predicate.operator],
-                         `child.predicate.value`))
+                         repr(child.predicate.value)))
                 body += child.python_body(depth + 1)
         else:
-            body = "%s return %s\n" % (INDENT * depth, `self.output`)
+            body = "%s return %s\n" % (INDENT * depth, repr(self.output))
         return body
 
     def python(self, out):