Skip to content

A Smart, Automatic, Fast and Lightweight Web Scraper for Python

Fix merge artifacts

PickNickChocka6c47ae74d7f
diff --git a/autoscraper/auto_scraper.py b/autoscraper/auto_scraper.py
index 9b64a10..774b6ac 100644
--- a/autoscraper/auto_scraper.py
+++ b/autoscraper/auto_scraper.py
@@ -299,11 +299,6 @@ class AutoScraper(object):
return similar, exact
def remove_rules(self, rules):
-<<<<<<< HEAD
- self.stack_list = [x for x in self.stack_list if x['stack_id'] not in rules]
-
- def keep_rules(self, rules):
-=======
"""
Removes a list of learned rules from stack_list.
@@ -316,7 +311,6 @@ class AutoScraper(object):
--------
None
"""
-
self.stack_list = [x for x in self.stack_list if x['stack_id'] not in rules]
def keep_rules(self, rules):
@@ -328,8 +322,6 @@ class AutoScraper(object):
rules : list
A list of rules to keep in stack_list.
"""
-
->>>>>>> 69dbdc1e1cd0943578ea0fd0b4bb2a836a262fdb
self.stack_list = [x for x in self.stack_list if x['stack_id'] in rules]
def generate_python_code(self):