Browse Source

cache: avoid name collision

master
pictuga 1 month ago
parent
commit
a523518ae8
  1. 0
      morss/caching.py
  2. 2
      morss/crawler.py
  3. 4
      morss/morss.py
  4. 6
      morss/wsgi.py

0
morss/cache.py → morss/caching.py

2
morss/crawler.py

@ -28,7 +28,7 @@ from io import BytesIO, StringIO
import chardet
from .cache import default_cache
from .caching import default_cache
try:
# python 2

4
morss/morss.py

@ -25,7 +25,7 @@ import lxml.etree
import lxml.html
from dateutil import tz
from . import crawler, feeds, readabilite
from . import caching, crawler, feeds, readabilite
try:
# python 2
@ -411,7 +411,7 @@ def process(url, cache=None, options=None):
options = Options(options)
if cache:
crawler.default_cache = crawler.SQLiteCache(cache)
caching.default_cache = caching.SQLiteCache(cache)
url, rss = FeedFetch(url, options)
rss = FeedGather(rss, url, options)

6
morss/wsgi.py

@ -33,7 +33,7 @@ except ImportError:
# python 3
from urllib.parse import unquote
from . import crawler, readabilite
from . import caching, crawler, readabilite
from .morss import (DELAY, TIMEOUT, FeedFetch, FeedFormat, FeedGather,
MorssException, Options, log)
@ -287,7 +287,7 @@ class WSGIRequestHandlerRequestUri(wsgiref.simple_server.WSGIRequestHandler):
def cgi_start_server():
crawler.default_cache.autotrim()
caching.default_cache.autotrim()
print('Serving http://localhost:%s/' % PORT)
httpd = wsgiref.simple_server.make_server('', PORT, application, handler_class=WSGIRequestHandlerRequestUri)
@ -295,4 +295,4 @@ def cgi_start_server():
if 'gunicorn' in os.getenv('SERVER_SOFTWARE', ''):
crawler.default_cache.autotrim()
caching.default_cache.autotrim()

Loading…
Cancel
Save