From 79cf15b95c30cd937a9394df92ed87a3a635c07e Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Sun, 15 Jun 2014 20:50:00 +0200 Subject: [PATCH] Refractoring double code --- FourmiCrawler/sources/ChemSpider.py | 4 ---- FourmiCrawler/sources/NIST.py | 4 ---- FourmiCrawler/sources/WikipediaParser.py | 4 ---- FourmiCrawler/sources/source.py | 3 +++ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/FourmiCrawler/sources/ChemSpider.py b/FourmiCrawler/sources/ChemSpider.py index 3f1538f..0110e57 100644 --- a/FourmiCrawler/sources/ChemSpider.py +++ b/FourmiCrawler/sources/ChemSpider.py @@ -28,10 +28,6 @@ class ChemSpider(Source): def __init__(self, config=None): Source.__init__(self, config) - if self.cfg is None: - self.cfg = {} - else: - self.cfg = config self.ignore_list = [] if 'token' not in self.cfg or self.cfg['token'] == '': log.msg('ChemSpider token not set or empty, search/MassSpec API ' diff --git a/FourmiCrawler/sources/NIST.py b/FourmiCrawler/sources/NIST.py index e81db5a..934b457 100644 --- a/FourmiCrawler/sources/NIST.py +++ b/FourmiCrawler/sources/NIST.py @@ -25,10 +25,6 @@ class NIST(Source): def __init__(self, config=None): Source.__init__(self, config) self.ignore_list = set() - if config is None: - self.cfg = {} - else: - self.cfg = config def parse(self, response): sel = Selector(response) diff --git a/FourmiCrawler/sources/WikipediaParser.py b/FourmiCrawler/sources/WikipediaParser.py index cfd2555..401698c 100644 --- a/FourmiCrawler/sources/WikipediaParser.py +++ b/FourmiCrawler/sources/WikipediaParser.py @@ -21,10 +21,6 @@ class WikipediaParser(Source): def __init__(self, config=None): Source.__init__(self, config) - if config is None: - self.cfg = {} - else: - self.cfg = config def parse(self, response): """ diff --git a/FourmiCrawler/sources/source.py b/FourmiCrawler/sources/source.py index fe36784..36218b0 100644 --- a/FourmiCrawler/sources/source.py +++ b/FourmiCrawler/sources/source.py @@ -10,6 +10,9 @@ class Source: """ Initiation of a new Source """ + self.cfg = {} + if config is not None: + self.cfg = config pass def parse(self, response):