Merge pull request #61 from kelockhart/py3

Make compatible with Python 2.7 and 3

.gitignore

@@ -104,3 +104,6 @@ python/
 
 # emacs
 *~
+
+**/.DS_Store
+*.idea

Dockerfile

@@ -5,9 +5,9 @@ RUN \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes autoconf automake libtool curl make g++ unzip wget && \
     rm -rf /var/lib/apt/lists/* && \
-    wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-python-3.3.0.tar.gz && \
-    tar -zxvf protobuf-python-3.3.0.tar.gz && \
-    cd protobuf-3.3.0/ && \
+    wget https://github.com/google/protobuf/releases/download/v3.11.3/protobuf-python-3.11.3.tar.gz && \
+    tar -zxvf protobuf-python-3.11.3.tar.gz && \
+    cd protobuf-3.11.3/ && \
     ./configure && \
     make -j 2 && \
     make install && \

adsmsg/__init__.py

@@ -16,7 +16,6 @@
 from .status import Status
 from .citation_changes import CitationChanges, CitationChange
 from .citation_changes_content_type import CitationChangeContentType
-from .turbobee import TurboBeeMsg
 
 
 

adsmsg/msg.py

@@ -1,3 +1,6 @@
+from builtins import str
+from past.builtins import basestring
+from builtins import object
 from datetime import datetime
 from google.protobuf import json_format
 from google.protobuf import timestamp_pb2
@@ -17,12 +20,12 @@ def __init__(self, instance, args, kwargs):
                 if isinstance(kwargs['status'], basestring) and hasattr(Status, kwargs['status']):
                     kwargs['status'] = getattr(Status, kwargs['status'])
 
-            for k, v in kwargs.items():
+            for k, v in list(kwargs.items()):
                 if isinstance(v, list) or isinstance(v, tuple):
                     getattr(instance, k).extend(v) #TODO(rca): use some smarter reflection
                 elif isinstance(v, dict):
                     x = getattr(instance, k)
-                    for dk in v.keys():
+                    for dk in list(v.keys()):
                          x[dk] = v[dk]
                 elif isinstance(v, datetime):
                     getattr(instance, k).FromDatetime(v)