Skip to content

Commit

Permalink
Merge pull request #370 from WillAyd/no-new-style
Browse files Browse the repository at this point in the history
Removed old py2 inheritance
  • Loading branch information
sbabayan authored Dec 4, 2019
2 parents ecad0c5 + 911820a commit 109148c
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tabpy/tabpy_server/common/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import json


class Msg(object):
class Msg:
"""
An abstract base class for all messages used for communicating between
the WebServices.
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_server/handlers/base_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
STAGING_THREAD = concurrent.futures.ThreadPoolExecutor(max_workers=3)


class ContextLoggerWrapper(object):
class ContextLoggerWrapper:
'''
This class appends request context to logged messages.
'''
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_server/management/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def get_query_object_path(state_file_path, name, version):
return full_path


class TabPyState(object):
class TabPyState:
'''
The TabPy state object that stores attributes
about this TabPy and perform GET/SET on these
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_server/psws/python_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def manage_request(self, msg):
return UnknownMessage(msg)


class PythonService(object):
class PythonService:
"""
This class is a simple wrapper maintaining loaded query objects from
the current TabPy instance. `query_objects` is a dictionary that
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_tools/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def _check_endpoint_name(name):
' underscore, hyphens and spaces.')


class Client(object):
class Client:
def __init__(self,
endpoint,
query_timeout=1000):
Expand Down
6 changes: 3 additions & 3 deletions tabpy/tabpy_tools/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __str__(self):
f'{self.info}')


class RequestsNetworkWrapper(object):
class RequestsNetworkWrapper:
"""The NetworkWrapper wraps the underlying network connection to simplify
the interface a bit. This can be replaced with something that can be built
on some other type of network connection, such as PyCURL.
Expand Down Expand Up @@ -178,7 +178,7 @@ def set_credentials(self, username, password):
self.auth = HTTPBasicAuth(username, password)


class ServiceClient(object):
class ServiceClient:
"""
A generic service client.
Expand Down Expand Up @@ -235,7 +235,7 @@ def set_credentials(self, username, password):
self.network_wrapper.set_credentials(username, password)


class RESTProperty(object):
class RESTProperty:
"""A descriptor that will control the type of value stored."""

def __init__(self, type, from_json=lambda x: x, to_json=lambda x: x,
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_tools/rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def __init__(self, **kwargs):
self.type = 'alias'


class RESTServiceClient(object):
class RESTServiceClient:
"""A thin client for the REST Service."""
def __init__(self, service_client):
self.service_client = service_client
Expand Down

0 comments on commit 109148c

Please sign in to comment.