Skip to content

Commit

Permalink
Merge pull request #117 from Lukas0907/master
Browse files Browse the repository at this point in the history
addendum.org: Remove more elements.
  • Loading branch information
Lukas0907 committed May 23, 2018
2 parents 468d197 + e025090 commit 8cdec1f
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 42 deletions.
6 changes: 6 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[settings]
line_length = 88
multi_line_output = 3
combine_as_imports = true
include_trailing_comma = true
not_skip = __init__.py
2 changes: 1 addition & 1 deletion feeds/cache.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import datetime
import logging
import os
import pickle
from datetime import datetime

logger = logging.getLogger(__name__)

Expand Down
8 changes: 3 additions & 5 deletions feeds/cli.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
from datetime import datetime
from datetime import timedelta
import configparser
import logging
import os
from datetime import datetime, timedelta

import click
from scrapy.crawler import CrawlerProcess
from scrapy.utils.log import configure_logging
from scrapy.utils.project import get_project_settings
from scrapy.utils.project import data_path
from scrapy.utils.project import data_path, get_project_settings
from twisted.python import failure
import click

from feeds.cache import cleanup_cache

Expand Down
5 changes: 2 additions & 3 deletions feeds/exporters.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from urllib.parse import urljoin
import logging
import os
from urllib.parse import urljoin

from lxml import etree
from scrapy.exporters import BaseItemExporter

from feeds.items import FeedEntryItem
from feeds.items import FeedItem
from feeds.items import FeedEntryItem, FeedItem


class AtomExporter(BaseItemExporter):
Expand Down
17 changes: 6 additions & 11 deletions feeds/loaders.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
from datetime import datetime
import html
import os
import re
from datetime import datetime

import dateparser
import delorean
import lxml
from lxml import etree
from lxml.cssselect import CSSSelector
from lxml.html import HtmlComment
from scrapy.loader import ItemLoader
from scrapy.loader.processors import Compose
from scrapy.loader.processors import Identity
from scrapy.loader.processors import Join
from scrapy.loader.processors import MapCompose
from scrapy.loader.processors import TakeFirst
from scrapy.loader.processors import Compose, Identity, Join, MapCompose, TakeFirst
from w3lib.html import remove_tags
import delorean
import dateparser
import lxml

from feeds.items import FeedItem
from feeds.items import FeedEntryItem
from feeds.items import FeedEntryItem, FeedItem


def parse_datetime(text, loader_context):
Expand Down
4 changes: 1 addition & 3 deletions feeds/spiders/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from scrapy.spiders import CrawlSpider
from scrapy.spiders import Spider
from scrapy.spiders import XMLFeedSpider
import scrapy
from scrapy.spiders import CrawlSpider, Spider, XMLFeedSpider

from feeds.loaders import FeedItemLoader

Expand Down
3 changes: 3 additions & 0 deletions feeds/spiders/addendum_org.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ def _parse_article(self, response):
".callToAction",
".print-action",
".internalLink span",
".addCommunity",
".download",
".BCaudioPlayer",
]
change_tags = {
"div.heroStage__introText": "strong",
Expand Down
2 changes: 1 addition & 1 deletion feeds/spiders/facebook_com.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import json

from scrapy import Request
import bleach
import w3lib.url
from scrapy import Request

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsSpider
Expand Down
4 changes: 2 additions & 2 deletions feeds/spiders/falter_at.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from collections import OrderedDict
from datetime import timedelta
import json
import re
from collections import OrderedDict
from datetime import timedelta

import delorean
import scrapy
Expand Down
6 changes: 3 additions & 3 deletions feeds/spiders/lwn_net.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from datetime import timedelta
import re
from datetime import timedelta

from scrapy.loader.processors import TakeFirst
import scrapy
import delorean
import scrapy
from scrapy.loader.processors import TakeFirst

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsXMLFeedSpider
Expand Down
2 changes: 1 addition & 1 deletion feeds/spiders/openwrt_org.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import scrapy
from scrapy.linkextractors import LinkExtractor
from scrapy.spiders import Rule
import scrapy

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsCrawlSpider
Expand Down
4 changes: 2 additions & 2 deletions feeds/spiders/tvthek_orf_at.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from datetime import timedelta
import json
from datetime import timedelta

from scrapy import Request
import delorean
from scrapy import Request

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsSpider
Expand Down
8 changes: 4 additions & 4 deletions feeds/spiders/uebermedien_de.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from scrapy.http import FormRequest
import scrapy

from urllib.parse import urlparse, parse_qs
import json
from urllib.parse import parse_qs, urlparse

import scrapy
from scrapy.http import FormRequest

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsXMLFeedSpider
Expand Down
2 changes: 1 addition & 1 deletion feeds/spiders/usenix_org.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from datetime import datetime
import re
from datetime import datetime

import scrapy

Expand Down
2 changes: 1 addition & 1 deletion feeds/spiders/vice_com.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import delorean
import json

import delorean
import scrapy

from feeds.loaders import FeedEntryItemLoader
Expand Down
4 changes: 2 additions & 2 deletions feeds/spiders/wienerlinien_at.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from scrapy.http import HtmlResponse
import scrapy
from scrapy.http import HtmlResponse

from feeds.spiders import FeedsSpider
from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsSpider


class WienerLinienAtSpider(FeedsSpider):
Expand Down
3 changes: 2 additions & 1 deletion feeds/spiders/zeitdiebin_at.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import scrapy
import datetime

import scrapy

from feeds.loaders import FeedEntryItemLoader
from feeds.spiders import FeedsSpider

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from setuptools import setup, find_packages
from setuptools import find_packages, setup

setup(
name="feeds",
Expand Down

0 comments on commit 8cdec1f

Please sign in to comment.