Merge pull request #32 from carlosalberto/LS-579

Support Python 3

Author: Ted Young

Makefile

@@ -57,6 +57,7 @@ test: build
 # the command is run within the LightStep development environment (i.e. the
 # LIGHTSTEP_HOME environment variable is set).
 thrift:
-	docker run -v "$(PWD)/lightstep:/out" -v "$(LIGHTSTEP_HOME)/go/src/crouton:/data" --rm thrift:0.9.2 \
+	docker run -v "$(PWD)/lightstep:/out" -v "$(LIGHTSTEP_HOME)/go/src/crouton:/data" --rm thrift:0.10.0 \
 		thrift -r --gen py -out /out /data/crouton.thrift
+	python-modernize -w lightstep/crouton/
 	rm -rf lightstep/crouton/ReportingService-remote

lightstep/crouton/ReportingService.py

@@ -38,7 +38,7 @@ def extract(self, carrier):
             raise InvalidCarrierException()
         serializedProto = standard_b64decode(carrier)
         state = BinaryCarrier()
-        state.ParseFromString(str(serializedProto))
+        state.ParseFromString(bytes(serializedProto))
         baggage = {}
         for k in state.basic_ctx.baggage_items:
             baggage[k] = state.basic_ctx.baggage_items[k]
@@ -47,4 +47,4 @@ def extract(self, carrier):
             span_id=state.basic_ctx.span_id,
             trace_id=state.basic_ctx.trace_id,
             baggage=baggage,
-            sampled=state.basic_ctx.sampled)
+            sampled=state.basic_ctx.sampled)