Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Futurize to support Python 3 #28

Merged
merged 11 commits into from
Aug 10, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lint
  • Loading branch information
Yuri Shkuro committed Jul 30, 2017
commit 9f137311cc61d8b2c33b298add20f9df684b1263
2 changes: 1 addition & 1 deletion opentracing_instrumentation/client_hooks/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from future import standard_library
standard_library.install_aliases()
import logging
import urllib.request, urllib.parse, urllib.error
import urllib.parse

from ..request_context import get_current_span
from ..http_client import AbstractRequestWrapper
Expand Down
2 changes: 1 addition & 1 deletion opentracing_instrumentation/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# THE SOFTWARE.

from __future__ import absolute_import
from builtins import object


from builtins import object
class _Config(object):
def __init__(self, app_name=None):
self.app_name = app_name
Expand Down
2 changes: 1 addition & 1 deletion opentracing_instrumentation/http_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
standard_library.install_aliases()
from builtins import object
import logging
import urllib.request, urllib.parse, urllib.error
import urllib.parse
import opentracing
import six
from opentracing import Format
Expand Down
2 changes: 1 addition & 1 deletion opentracing_instrumentation/local_span.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def decorator(*args, **kwargs):
return func(*args, **kwargs)

span = utils.start_child_span(
operation_name=operation_name, parent=parent_span)
operation_name=operation_name, parent=parent_span)
if callable(on_start):
on_start(span, *args, **kwargs)

Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
max-line-length = 79
# max-complexity = 8
exclude = ./docs/,tests/*
ignore = E402

[zest.releaser]
release = no
Expand Down