backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 08:04:49 +01:00
Code Issues Projects Releases Activity

refactor: fix recorder and urlrewrite packages #200

Browse Source
This commit is contained in:
Ilya Kreymer 2016-11-08 15:04:22 -08:00
parent 6b4b038471
commit fa247b8fe5
10 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywb/recorder/recorderapp.py
View File

@ -1,7 +1,7 @@
from webagg.utils import StreamIter, chunk_encode_iter, BUFF_SIZE
from webagg.inputrequest import DirectWSGIInputRequest
from pywb.webagg.utils import StreamIter, chunk_encode_iter, BUFF_SIZE
from pywb.webagg.inputrequest import DirectWSGIInputRequest
from recorder.filters import SkipRangeRequestFilter, CollectionFilter
from pywb.recorder.filters import SkipRangeRequestFilter, CollectionFilter
from six.moves.urllib.parse import parse_qsl

8
pywb/recorder/redisindexer.py
View File

@ -6,11 +6,11 @@ from pywb.utils.timeutils import iso_date_to_timestamp
from io import BytesIO
import os
from webagg.indexsource import RedisIndexSource
from webagg.aggregator import SimpleAggregator
from webagg.utils import res_template
from pywb.webagg.indexsource import RedisIndexSource
from pywb.webagg.aggregator import SimpleAggregator
from pywb.webagg.utils import res_template
from recorder.filters import WriteRevisitDupePolicy
from pywb.recorder.filters import WriteRevisitDupePolicy
#==============================================================================

8
pywb/recorder/test/simplerec.py
View File

@ -1,10 +1,10 @@
from gevent import monkey; monkey.patch_all()
from recorder.recorderapp import RecorderApp
from recorder.redisindexer import WritableRedisIndexer
from pywb.recorder.recorderapp import RecorderApp
from pywb.recorder.redisindexer import WritableRedisIndexer
from recorder.warcwriter import MultiFileWARCWriter
from recorder.filters import SkipDupePolicy
from pywb.recorder.warcwriter import MultiFileWARCWriter
from pywb.recorder.filters import SkipDupePolicy
import atexit
import tempfile

17
pywb/recorder/test/test_recorder.py
View File

@ -1,8 +1,9 @@
#from gevent import monkey; monkey.patch_all()
import gevent
from webagg.test.testutils import TempDirTests, LiveServerTests, BaseTestClass, to_path
from webagg.test.testutils import FakeRedisTests
import pywb.webagg
from pywb.webagg.test.testutils import TempDirTests, LiveServerTests, BaseTestClass, to_path
from pywb.webagg.test.testutils import FakeRedisTests
import os
import webtest
@ -10,13 +11,13 @@ import webtest
from pytest import raises
from fakeredis import FakeStrictRedis
from recorder.recorderapp import RecorderApp
from recorder.redisindexer import WritableRedisIndexer
from recorder.warcwriter import PerRecordWARCWriter, MultiFileWARCWriter, SimpleTempWARCWriter
from recorder.filters import ExcludeSpecificHeaders
from recorder.filters import SkipDupePolicy, WriteDupePolicy, WriteRevisitDupePolicy
from pywb.recorder.recorderapp import RecorderApp
from pywb.recorder.redisindexer import WritableRedisIndexer
from pywb.recorder.warcwriter import PerRecordWARCWriter, MultiFileWARCWriter, SimpleTempWARCWriter
from pywb.recorder.filters import ExcludeSpecificHeaders
from pywb.recorder.filters import SkipDupePolicy, WriteDupePolicy, WriteRevisitDupePolicy
from webagg.utils import MementoUtils
from pywb.webagg.utils import MementoUtils
from pywb.cdx.cdxobject import CDXObject
from pywb.utils.statusandheaders import StatusAndHeadersParser

4
pywb/recorder/warcwriter.py
View File

@ -27,9 +27,9 @@ from pywb.warc.recordloader import ArcWarcRecord
from pywb.warc.recordloader import ArcWarcRecordLoader
from requests.structures import CaseInsensitiveDict
from webagg.utils import ParamFormatter, res_template
from pywb.webagg.utils import ParamFormatter, res_template
from recorder.filters import ExcludeNone
from pywb.recorder.filters import ExcludeNone
# ============================================================================

2
pywb/urlrewrite/platformhandler.py
View File

@ -14,7 +14,7 @@ from pywb.cdx.cdxobject import CDXObject
from io import BytesIO
from rewriteinputreq import RewriteInputRequest
from pywb.urlrewrite.rewriteinputreq import RewriteInputRequest
from six.moves.urllib.parse import quote

2
pywb/urlrewrite/rewriteinputreq.py
View File

@ -1,4 +1,4 @@
from webagg.inputrequest import DirectWSGIInputRequest
from pywb.webagg.inputrequest import DirectWSGIInputRequest
from pywb.utils.loaders import extract_client_cookie
from six import iteritems

4
pywb/urlrewrite/rewriterapp.py
View File

@ -15,8 +15,8 @@ from pywb.framework.wbrequestresponse import WbResponse
from six.moves.urllib.parse import urlencode
from urlrewrite.rewriteinputreq import RewriteInputRequest
from urlrewrite.templateview import JinjaEnv, HeadInsertView, TopFrameView, BaseInsertView
from pywb.urlrewrite.rewriteinputreq import RewriteInputRequest
from pywb.urlrewrite.templateview import JinjaEnv, HeadInsertView, TopFrameView, BaseInsertView
from io import BytesIO

4
pywb/urlrewrite/test/simpleapp.py
View File

@ -9,8 +9,8 @@ from pywb.utils.loaders import LocalFileLoader
import mimetypes
import redis
from urlrewrite.rewriterapp import RewriterApp
from urlrewrite.cookies import CookieTracker
from pywb.urlrewrite.rewriterapp import RewriterApp
from pywb.urlrewrite.cookies import CookieTracker
# ============================================================================

4
pywb/urlrewrite/test/test_rewriter.py
View File

@ -1,6 +1,6 @@
from webagg.test.testutils import LiveServerTests, BaseTestClass
from webagg.test.testutils import FakeRedisTests
from pywb.webagg.test.testutils import LiveServerTests, BaseTestClass
from pywb.webagg.test.testutils import FakeRedisTests
from .simpleapp import RWApp, debug