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

drop unnecessary backwards compatibility (remove six) #228

Merged
merged 1 commit into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 0 additions & 2 deletions beeline/patch/test_urllib.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import absolute_import
import six
import unittest
from mock import Mock, patch

import urllib


class TestUrllibPatch(unittest.TestCase):
@unittest.skipIf(six.PY2, "urllib not compatible with python2")
def test_request_fn_injects_headers_and_returns(self):
from beeline.patch.urllib import _urllibopen # pylint: disable=bad-option-value,import-outside-toplevel

Expand Down
4 changes: 1 addition & 3 deletions beeline/propagation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import six
from abc import ABCMeta, abstractmethod
import beeline

Expand All @@ -23,8 +22,7 @@ def __init__(self, trace_id, parent_id, trace_fields={}, dataset=None):
self.dataset = dataset


@six.add_metaclass(ABCMeta)
class Request(object):
class Request(object, metaclass=ABCMeta):
'''
beeline.propagation.Request is an abstract class that defines the interface that should
be used by middleware to pass request information into http_trace_parser_hooks. It should
Expand Down
2 changes: 1 addition & 1 deletion beeline/propagation/honeycomb.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from beeline.propagation import PropagationContext
import base64
import json
from six.moves.urllib.parse import quote, unquote
from urllib.parse import quote, unquote


def http_trace_parser_hook(request):
Expand Down
2 changes: 1 addition & 1 deletion pylint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ init-import=no

# List of qualified module names which can have objects that can redefine
# builtins.
redefining-builtins-modules=six.moves,past.builtins,future.builtins,io,builtins
redefining-builtins-modules=past.builtins,future.builtins,io,builtins


[FORMAT]
Expand Down