refactor: Replace super(.*self) with Python 3-specific super().

We change all the instances except for the `test_helpers.py`
TimeTrackingCursor monkey-patching, which actually needs to specify
the base class.
This commit is contained in:
rht
2017-10-27 08:28:23 +02:00
committed by Tim Abbott
parent d140451fb4
commit c4fcff7178
32 changed files with 68 additions and 68 deletions

View File

@@ -24,7 +24,7 @@ class HelpDocumentationSpider(BaseDocumentationSpider):
help_images_static_dir = get_help_images_dir(help_images_path)
def __init__(self, *args: Any, **kwargs: Any) -> None:
super(HelpDocumentationSpider, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.static_images = set() # type: Set
def _is_external_url(self, url: str) -> bool:

View File

@@ -30,7 +30,7 @@ class BaseDocumentationSpider(scrapy.Spider):
attrs = ('href', 'src')
def __init__(self, *args: Any, **kwargs: Any) -> None:
super(BaseDocumentationSpider, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.has_error = False
def _set_error_state(self) -> None:

View File

@@ -199,14 +199,14 @@ class BaseWebsocketHandler(WebSocketHandler):
def __init__(self, *args, **kwargs):
# type: (*Any, **Any) -> None
super(BaseWebsocketHandler, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# define client for target websocket server
self.client = None # type: Any
def get(self, *args, **kwargs):
# type: (*Any, **Any) -> Optional[Callable]
# use get method from WebsocketHandler
return super(BaseWebsocketHandler, self).get(*args, **kwargs)
return super().get(*args, **kwargs)
def open(self):
# type: () -> None
@@ -262,7 +262,7 @@ class CombineHandler(BaseWebsocketHandler):
def get(self, *args, **kwargs):
# type: (*Any, **Any) -> Optional[Callable]
if self.request.headers.get("Upgrade", "").lower() == 'websocket':
return super(CombineHandler, self).get(*args, **kwargs)
return super().get(*args, **kwargs)
return None
def head(self):
@@ -314,7 +314,7 @@ class CombineHandler(BaseWebsocketHandler):
if 'X-REAL-IP' not in self.request.headers:
self.request.headers['X-REAL-IP'] = self.request.remote_ip
if self.request.headers.get("Upgrade", "").lower() == 'websocket':
return super(CombineHandler, self).prepare()
return super().prepare()
url = transform_url(
self.request.protocol,
self.request.path,
@@ -363,12 +363,12 @@ class Application(web.Application):
(r"/sockjs.*", TornadoHandler),
(r"/.*", DjangoHandler)
]
super(Application, self).__init__(handlers, enable_logging=enable_logging)
super().__init__(handlers, enable_logging=enable_logging)
def log_request(self, handler):
# type: (BaseWebsocketHandler) -> None
if self.settings['enable_logging']:
super(Application, self).log_request(handler)
super().log_request(handler)
def on_shutdown():