From a0bcf07b9fdd079ba97596871fe810aa512e6b2f Mon Sep 17 00:00:00 2001 From: my8100 Date: Wed, 17 Apr 2019 17:59:33 +0800 Subject: [PATCH] Fix super(self.__class__, self).__init__() --- scrapydweb/files/items.py | 2 +- scrapydweb/files/log.py | 2 +- scrapydweb/files/logs.py | 2 +- scrapydweb/files/parse.py | 4 ++-- scrapydweb/files/projects.py | 2 +- scrapydweb/myview.py | 2 +- scrapydweb/operations/deploy.py | 6 +++--- scrapydweb/operations/schedule.py | 10 +++++----- scrapydweb/overview/jobs.py | 4 ++-- scrapydweb/overview/multinode.py | 2 +- scrapydweb/overview/servers.py | 2 +- scrapydweb/overview/tasks.py | 4 ++-- scrapydweb/system/settings.py | 2 +- scrapydweb/views/api.py | 2 +- scrapydweb/views/index.py | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scrapydweb/files/items.py b/scrapydweb/files/items.py index c1b82db..69b8932 100644 --- a/scrapydweb/files/items.py +++ b/scrapydweb/files/items.py @@ -12,7 +12,7 @@ class ItemsView(MyView): methods = ['GET'] def __init__(self): - super(self.__class__, self).__init__() + super(ItemsView, self).__init__() self.project = self.view_args['project'] self.spider = self.view_args['spider'] diff --git a/scrapydweb/files/log.py b/scrapydweb/files/log.py index 03972d8..a50c6d2 100644 --- a/scrapydweb/files/log.py +++ b/scrapydweb/files/log.py @@ -41,7 +41,7 @@ class LogView(MyView): job_finished_set = job_finished_set def __init__(self): - super(self.__class__, self).__init__() # super().__init__() + super(LogView, self).__init__() # super().__init__() self.opt = self.view_args['opt'] self.project = self.view_args['project'] diff --git a/scrapydweb/files/logs.py b/scrapydweb/files/logs.py index 0d6f88c..9193439 100644 --- a/scrapydweb/files/logs.py +++ b/scrapydweb/files/logs.py @@ -11,7 +11,7 @@ class LogsView(MyView): methods = ['GET'] def __init__(self): - super(self.__class__, self).__init__() + super(LogsView, self).__init__() self.project = self.view_args['project'] self.spider = self.view_args['spider'] diff --git a/scrapydweb/files/parse.py b/scrapydweb/files/parse.py index 2f8f8bc..23db167 100644 --- a/scrapydweb/files/parse.py +++ b/scrapydweb/files/parse.py @@ -23,7 +23,7 @@ def source(filename): class UploadLogView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(UploadLogView, self).__init__() self.template = 'scrapydweb/parse.html' @@ -57,7 +57,7 @@ def dispatch_request(self, **kwargs): class UploadedLogView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(UploadedLogView, self).__init__() self.filename = self.view_args['filename'] self.template = 'scrapydweb/stats.html' diff --git a/scrapydweb/files/projects.py b/scrapydweb/files/projects.py index 4b9912e..bf8d747 100644 --- a/scrapydweb/files/projects.py +++ b/scrapydweb/files/projects.py @@ -10,7 +10,7 @@ class ProjectsView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ProjectsView, self).__init__() self.opt = self.view_args['opt'] self.project = self.view_args['project'] diff --git a/scrapydweb/myview.py b/scrapydweb/myview.py index 7cd1fdc..e226384 100644 --- a/scrapydweb/myview.py +++ b/scrapydweb/myview.py @@ -315,7 +315,7 @@ def update_g(self): class MetadataView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(MetadataView, self).__init__() def dispatch_request(self, **kwargs): return self.json_dumps(handle_metadata()) diff --git a/scrapydweb/operations/deploy.py b/scrapydweb/operations/deploy.py index 858a73a..0e211d4 100644 --- a/scrapydweb/operations/deploy.py +++ b/scrapydweb/operations/deploy.py @@ -36,7 +36,7 @@ class DeployView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(DeployView, self).__init__() self.url = 'http://{}/{}.json'.format(self.SCRAPYD_SERVER, 'addversion') self.template = 'scrapydweb/deploy.html' @@ -137,7 +137,7 @@ class DeployUploadView(MyView): methods = ['POST'] def __init__(self): - super(self.__class__, self).__init__() + super(DeployUploadView, self).__init__() self.url = '' self.template = 'scrapydweb/deploy_results.html' @@ -388,7 +388,7 @@ def prepare_data(self): class DeployXhrView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(DeployXhrView, self).__init__() self.eggname = self.view_args['eggname'] self.project = self.view_args['project'] diff --git a/scrapydweb/operations/schedule.py b/scrapydweb/operations/schedule.py index d43892c..a888ba8 100644 --- a/scrapydweb/operations/schedule.py +++ b/scrapydweb/operations/schedule.py @@ -53,7 +53,7 @@ def history(): class ScheduleView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ScheduleView, self).__init__() self.project = self.view_args['project'] self.version = self.view_args['version'] @@ -209,7 +209,7 @@ def update_kwargs(self): class ScheduleCheckView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ScheduleCheckView, self).__init__() self.url = 'http://%s/schedule.json' % self.SCRAPYD_SERVER self.template = 'scrapydweb/schedule.html' @@ -328,7 +328,7 @@ def update_data_for_timer_task(self): class ScheduleRunView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ScheduleRunView, self).__init__() self.url = '' self.template = 'scrapydweb/schedule_results.html' @@ -592,7 +592,7 @@ def generate_response(self): class ScheduleXhrView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ScheduleXhrView, self).__init__() self.filename = self.view_args['filename'] self.url = 'http://%s/schedule.json' % self.SCRAPYD_SERVER @@ -614,7 +614,7 @@ def dispatch_request(self, **kwargs): class ScheduleTaskView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ScheduleTaskView, self).__init__() self.url = 'http://%s/schedule.json' % self.SCRAPYD_SERVER self.task_id = request.form['task_id'] diff --git a/scrapydweb/overview/jobs.py b/scrapydweb/overview/jobs.py index ad2da5e..cf85531 100644 --- a/scrapydweb/overview/jobs.py +++ b/scrapydweb/overview/jobs.py @@ -47,7 +47,7 @@ class JobsView(MyView): metadata = metadata def __init__(self): - super(self.__class__, self).__init__() + super(JobsView, self).__init__() style = request.args.get('style') self.style = style if style in ['database', 'classic'] else self.metadata['style'] @@ -417,7 +417,7 @@ class JobsXhrView(MyView): metadata = metadata def __init__(self): - super(self.__class__, self).__init__() + super(JobsXhrView, self).__init__() self.action = self.view_args['action'] # delete self.id = self.view_args['id'] # diff --git a/scrapydweb/overview/multinode.py b/scrapydweb/overview/multinode.py index 66da512..1a4e8d5 100644 --- a/scrapydweb/overview/multinode.py +++ b/scrapydweb/overview/multinode.py @@ -8,7 +8,7 @@ class MultinodeView(MyView): methods = ['POST'] def __init__(self): - super(self.__class__, self).__init__() + super(MultinodeView, self).__init__() self.opt = self.view_args['opt'] self.project = self.view_args['project'] diff --git a/scrapydweb/overview/servers.py b/scrapydweb/overview/servers.py index 4ff1580..54c0863 100644 --- a/scrapydweb/overview/servers.py +++ b/scrapydweb/overview/servers.py @@ -12,7 +12,7 @@ class ServersView(MyView): metadata = metadata def __init__(self): - super(self.__class__, self).__init__() + super(ServersView, self).__init__() self.opt = self.view_args['opt'] self.project = self.view_args['project'] diff --git a/scrapydweb/overview/tasks.py b/scrapydweb/overview/tasks.py index 3c88167..3ba1f8d 100644 --- a/scrapydweb/overview/tasks.py +++ b/scrapydweb/overview/tasks.py @@ -30,7 +30,7 @@ class TasksView(MyView): metadata = metadata def __init__(self): - super(self.__class__, self).__init__() + super(TasksView, self).__init__() self.task_id = self.view_args['task_id'] # , 0 ok, -1 fail self.task_result_id = self.view_args['task_result_id'] # @@ -255,7 +255,7 @@ def query_task_job_results(self): class TasksXhrView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(TasksXhrView, self).__init__() self.action = self.view_args['action'] # pause|resume|remove|delete|dump|fire self.task_id = self.view_args['task_id'] # diff --git a/scrapydweb/system/settings.py b/scrapydweb/system/settings.py index 6a284d2..7e827cf 100644 --- a/scrapydweb/system/settings.py +++ b/scrapydweb/system/settings.py @@ -14,7 +14,7 @@ class SettingsView(MyView): methods = ['GET'] def __init__(self): - super(self.__class__, self).__init__() + super(SettingsView, self).__init__() self.template = 'scrapydweb/settings.html' self.kwargs = dict(node=self.node) diff --git a/scrapydweb/views/api.py b/scrapydweb/views/api.py index b6f8b5c..faffe54 100644 --- a/scrapydweb/views/api.py +++ b/scrapydweb/views/api.py @@ -11,7 +11,7 @@ class ApiView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(ApiView, self).__init__() self.opt = self.view_args['opt'] self.project = self.view_args['project'] diff --git a/scrapydweb/views/index.py b/scrapydweb/views/index.py index 005dd92..497ee9b 100644 --- a/scrapydweb/views/index.py +++ b/scrapydweb/views/index.py @@ -7,7 +7,7 @@ class IndexView(MyView): def __init__(self): - super(self.__class__, self).__init__() + super(IndexView, self).__init__() def dispatch_request(self, **kwargs): if self.SCRAPYD_SERVERS_AMOUNT == 1: