diff options
| author | Dana Powers <dana.powers@rd.io> | 2016-01-07 18:51:14 -0800 |
|---|---|---|
| committer | Dana Powers <dana.powers@rd.io> | 2016-01-07 18:51:14 -0800 |
| commit | 828377377da43749af0d27ee256ef31bf714cf17 (patch) | |
| tree | fbad4d4381fc4d1ea2be7ce2009214d18fbeb674 /test/fixtures.py | |
| parent | 71e7568fcb8132899f366b37c32645fd5a40dc4b (diff) | |
| parent | 9a8af1499ca425366d934487469d9977fae7fe5f (diff) | |
| download | kafka-python-828377377da43749af0d27ee256ef31bf714cf17.tar.gz | |
Merge branch '0.9'
Conflicts:
kafka/codec.py
kafka/version.py
test/test_producer.py
test/test_producer_integration.py
Diffstat (limited to 'test/fixtures.py')
| -rw-r--r-- | test/fixtures.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/fixtures.py b/test/fixtures.py index 0ae1c1e..91a67c1 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -8,7 +8,7 @@ import time from six.moves import urllib import uuid -from six.moves.urllib.parse import urlparse # pylint: disable-msg=E0611,F0401 +from six.moves.urllib.parse import urlparse # pylint: disable=E0611,F0401 from test.service import ExternalService, SpawnedService from test.testutil import get_open_port |