git - Merge pull request #65 from DinoTools/pickle

Pickle Result() object

Author: phibos

overpy/__init__.py

@@ -19,6 +19,16 @@
 XML_PARSER_DOM = 1
 XML_PARSER_SAX = 2
 
+# Try to convert some common attributes
+# http://wiki.openstreetmap.org/wiki/Elements#Common_attributes
+GLOBAL_ATTRIBUTE_MODIFIERS = {
+    "changeset": int,
+    "timestamp": lambda ts: datetime.strptime(ts, "%Y-%m-%dT%H:%M:%SZ"),
+    "uid": int,
+    "version": int,
+    "visible": lambda v: v.lower() == "true"
+}
+
 if PY2:
     from urllib2 import urlopen
     from urllib2 import HTTPError
@@ -608,17 +618,10 @@ def __init__(self, attributes=None, result=None, tags=None):
         """
 
         self._result = result
-        # Try to convert some common attributes
-        # http://wiki.openstreetmap.org/wiki/Elements#Common_attributes
-        self._attribute_modifiers = {
-            "changeset": int,
-            "timestamp": lambda ts: datetime.strptime(ts, "%Y-%m-%dT%H:%M:%SZ"),
-            "uid": int,
-            "version": int,
-            "visible": lambda v: v.lower() == "true"
-        }
         self.attributes = attributes
-        for n, m in self._attribute_modifiers.items():
+        # ToDo: Add option to modify attribute modifiers
+        attribute_modifiers = dict(GLOBAL_ATTRIBUTE_MODIFIERS.items())
+        for n, m in attribute_modifiers.items():
             if n in self.attributes:
                 self.attributes[n] = m(self.attributes[n])
         self.id = None

tests/test_result.py

@@ -2,6 +2,7 @@
 
 import overpy
 
+from tests.base_class import BaseTestWay
 from tests import read_file, new_server_thread, stop_server_thread, BaseHTTPRequestHandler
 
 
@@ -109,6 +110,23 @@ def test_missing_resolvable(self):
         stop_server_thread(server)
 
 
+class TestPickle(BaseTestWay):
+    def test_way02(self):
+        """
+        Try to pickle and unpickle the result object
+        """
+        import pickle
+
+        api = overpy.Overpass()
+        result = api.parse_json(read_file("json/way-02.json"))
+        self._test_way02(result)
+        # do pickle and unpickle
+        result_string = pickle.dumps(result)
+        new_result = pickle.loads(result_string)
+        # test new result
+        self._test_way02(new_result)
+
+
 class TestRelation(object):
     def test_missing_unresolvable(self):
         url, server = new_server_thread(HandleResponseJSON02)