diff --git a/pywb/recorder/recorderapp.py b/pywb/recorder/recorderapp.py index eeded251..6d1b9984 100644 --- a/pywb/recorder/recorderapp.py +++ b/pywb/recorder/recorderapp.py @@ -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 diff --git a/pywb/recorder/redisindexer.py b/pywb/recorder/redisindexer.py index 577bf036..a990330e 100644 --- a/pywb/recorder/redisindexer.py +++ b/pywb/recorder/redisindexer.py @@ -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 #============================================================================== diff --git a/pywb/recorder/test/simplerec.py b/pywb/recorder/test/simplerec.py index f9c73b99..2a927498 100644 --- a/pywb/recorder/test/simplerec.py +++ b/pywb/recorder/test/simplerec.py @@ -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 diff --git a/pywb/recorder/test/test_recorder.py b/pywb/recorder/test/test_recorder.py index e6f75d9e..087d8c67 100644 --- a/pywb/recorder/test/test_recorder.py +++ b/pywb/recorder/test/test_recorder.py @@ -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 diff --git a/pywb/recorder/warcwriter.py b/pywb/recorder/warcwriter.py index b125da5e..ea8db360 100644 --- a/pywb/recorder/warcwriter.py +++ b/pywb/recorder/warcwriter.py @@ -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 # ============================================================================ diff --git a/pywb/urlrewrite/platformhandler.py b/pywb/urlrewrite/platformhandler.py index 02e0c117..9dbdf28e 100644 --- a/pywb/urlrewrite/platformhandler.py +++ b/pywb/urlrewrite/platformhandler.py @@ -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 diff --git a/pywb/urlrewrite/rewriteinputreq.py b/pywb/urlrewrite/rewriteinputreq.py index 18d84905..fac333d8 100644 --- a/pywb/urlrewrite/rewriteinputreq.py +++ b/pywb/urlrewrite/rewriteinputreq.py @@ -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 diff --git a/pywb/urlrewrite/rewriterapp.py b/pywb/urlrewrite/rewriterapp.py index ab7eba17..cc332d5a 100644 --- a/pywb/urlrewrite/rewriterapp.py +++ b/pywb/urlrewrite/rewriterapp.py @@ -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 diff --git a/pywb/urlrewrite/test/simpleapp.py b/pywb/urlrewrite/test/simpleapp.py index b651e24f..51e84456 100644 --- a/pywb/urlrewrite/test/simpleapp.py +++ b/pywb/urlrewrite/test/simpleapp.py @@ -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 # ============================================================================ diff --git a/pywb/urlrewrite/test/test_rewriter.py b/pywb/urlrewrite/test/test_rewriter.py index 4fdaff48..a0acd564 100644 --- a/pywb/urlrewrite/test/test_rewriter.py +++ b/pywb/urlrewrite/test/test_rewriter.py @@ -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