Skip to content
This repository was archived by the owner on Jul 11, 2022. It is now read-only.

Commit a72eb91

Browse files
authored
Replace past with six (#134)
* Replace `past` with `six` * Document issue with pycurl Signed-off-by: Yuri Shkuro <[email protected]>
1 parent cb545dd commit a72eb91

File tree

15 files changed

+29
-15
lines changed

15 files changed

+29
-15
lines changed

CONTRIBUTING.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ To install all dependencies, run:
2121
3. `make bootstrap`
2222
4. `make test`
2323

24+
### pycurl
25+
26+
On MacOS you may get an error:
27+
28+
```
29+
ImportError: pycurl: libcurl link-time ssl backend (openssl) is different from compile-time ssl backend (none/other)
30+
```
31+
32+
It can be fixed with:
33+
34+
```
35+
pip uninstall pycurl
36+
pip install --install-option="--with-openssl" --install-option="--openssl-dir=/usr/local/opt/openssl" pycurl
37+
```
38+
2439
## Making A Change
2540

2641
*Before making any significant changes, please [open an issue](https://github.com/jaegertracing/jaeger-client-python/issues).*

jaeger_client/codecs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from __future__ import absolute_import
1616

1717
from builtins import object
18-
from past.builtins import basestring
1918

2019
from opentracing import (
2120
InvalidCarrierException,
@@ -164,7 +163,7 @@ def span_context_from_string(value):
164163
raise SpanContextCorruptedException(
165164
'trace context must be a string or array of 1: "%s"' % value)
166165
value = value[0]
167-
if not isinstance(value, basestring):
166+
if not isinstance(value, six.string_types):
168167
raise SpanContextCorruptedException(
169168
'trace context not a string "%s"' % value)
170169
parts = value.split(':')

jaeger_client/thrift_gen/agent/Agent.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/agent/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/agent/ttypes.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/jaeger/Collector.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/jaeger/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/jaeger/ttypes.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/sampling/SamplingManager.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/sampling/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/sampling/ttypes.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/zipkincore/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/zipkincore/ttypes.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift-gen-fix.awk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ BEGIN {six=0; xrange=0}
44
# if in the future we need six, it can be added with the following line
55
# if (six == 0) print "import six"
66
six = 1
7-
if (xrange ==0) print "from past.builtins import xrange"
7+
if (xrange ==0) print "from six.moves import xrange"
88
xrange = 1
99
}
1010

0 commit comments

Comments
 (0)