Merge pull request #31 from srikiraju/master

Fix for protobuf 3.2

Author: borntyping

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 env:
   - TOXENV=py26-test
-  - TOXENV=py26-lint
   - TOXENV=py27-test
   - TOXENV=py27-lint
   - TOXENV=py34-test

riemann_client/client.py

@@ -26,6 +26,7 @@ def emit(self, record):
 
 import riemann_client.riemann_pb2
 import riemann_client.transport
+import google.protobuf.descriptor
 
 
 logger = logging.getLogger(__name__)
@@ -152,6 +153,9 @@ def create_dict(event):
                 value = list(value)
             elif descriptor.name == 'attributes':
                 value = dict(((a.key, a.value) for a in value))
+            elif descriptor.type == \
+                    google.protobuf.descriptor.FieldDescriptor.TYPE_FLOAT:
+                value = round(value, 1)
             data[descriptor.name] = value
 
         return data

riemann_client/riemann.proto

@@ -1,3 +1,4 @@
+package riemann_client;
 option java_package = "com.aphyr.riemann";
 option java_outer_classname = "Proto";
 

riemann_client/riemann_pb2.py

@@ -5,6 +5,6 @@
 __all__ = ['Event', 'Msg', 'Query', 'Attribute']
 
 if sys.version_info >= (3,):
-    from riemann_client.riemann_pb2_py3 import (Event, Msg, Query, Attribute)
+    from riemann_client.riemann_py3_pb2 import (Event, Msg, Query, Attribute)
 else:
-    from riemann_client.riemann_pb2_py2 import (Event, Msg, Query, Attribute)
+    from riemann_client.riemann_py2_pb2 import (Event, Msg, Query, Attribute)