Use six.iteritems instead of iteritems (#179)

Signed-off-by: Pedro Lacerda <pslacerda@gmail.com>
jaegertracing · May 26, 2018 · 9429e29 · 9429e29
1 parent 1df05e2
commit 9429e29
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -70,7 +70,7 @@ THRIFT_GEN_DIR=jaeger_client/thrift_gen
 THRIFT_VER=0.9.3
 THRIFT_IMG=thrift:$(THRIFT_VER)
 THRIFT_PY_ARGS=new_style,tornado
-THRIFT=docker run -v "${PWD}:/data" $(THRIFT_IMG) thrift
+THRIFT=docker run -v "${PWD}:/data" -u $(shell id -u) $(THRIFT_IMG) thrift
 
 idl-submodule:
 	git submodule init
@@ -96,4 +96,4 @@ thrift: idl-submodule thrift-image
 	done
 
 update-license:
-	python scripts/updateLicense.py $(sources)	
+	python scripts/updateLicense.py $(sources)
diff --git a/jaeger_client/thrift_gen/agent/Agent.py b/jaeger_client/thrift_gen/agent/Agent.py
diff --git a/jaeger_client/thrift_gen/agent/constants.py b/jaeger_client/thrift_gen/agent/constants.py
diff --git a/jaeger_client/thrift_gen/agent/ttypes.py b/jaeger_client/thrift_gen/agent/ttypes.py
diff --git a/jaeger_client/thrift_gen/jaeger/Collector.py b/jaeger_client/thrift_gen/jaeger/Collector.py
diff --git a/jaeger_client/thrift_gen/jaeger/constants.py b/jaeger_client/thrift_gen/jaeger/constants.py
diff --git a/jaeger_client/thrift_gen/jaeger/ttypes.py b/jaeger_client/thrift_gen/jaeger/ttypes.py
diff --git a/jaeger_client/thrift_gen/sampling/SamplingManager.py b/jaeger_client/thrift_gen/sampling/SamplingManager.py
diff --git a/jaeger_client/thrift_gen/sampling/constants.py b/jaeger_client/thrift_gen/sampling/constants.py
diff --git a/jaeger_client/thrift_gen/sampling/ttypes.py b/jaeger_client/thrift_gen/sampling/ttypes.py
diff --git a/jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py b/jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py
diff --git a/jaeger_client/thrift_gen/zipkincore/constants.py b/jaeger_client/thrift_gen/zipkincore/constants.py
diff --git a/jaeger_client/thrift_gen/zipkincore/ttypes.py b/jaeger_client/thrift_gen/zipkincore/ttypes.py
diff --git a/thrift-gen-fix.awk b/thrift-gen-fix.awk
@@ -1,14 +1,15 @@
-BEGIN {six=0; xrange=0}
+BEGIN {six=0}
 
 /^$/ {
-    # if in the future we need six, it can be added with the following line
-    # if (six == 0) print "import six"
+    if (six == 0) {
+        print "import six";
+        print "from six.moves import xrange";
+    }
     six = 1
-    if (xrange ==0) print "from six.moves import xrange"
-    xrange = 1
 }
 
 {
-        gsub(/from ttype/, "from .ttype",$0); 
-        print
-}
+    gsub(/from ttype/, "from .ttype", $0);
+    gsub(/self.__dict__.iteritems\(\)/, "six.iteritems(self.__dict__)", $0);
+    print
+}