1
0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00

update develop to 0.4.6

improved regex for top -> WB_wombat_top rewriting
This commit is contained in:
Ilya Kreymer 2014-06-16 15:57:22 -07:00
parent f26b0ddbe4
commit ac3efec4bc
4 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,8 @@
pywb 0.4.6 changelist
~~~~~~~~~~~~~~~~~~~~~
* Improved top -> WB_wombat_top rewriting.
pywb 0.4.5 changelist pywb 0.4.5 changelist
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~

View File

@ -1,11 +1,11 @@
PyWb 0.4.5 PyWb 0.4.6
========== ==========
.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=master .. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop
:target: https://travis-ci.org/ikreymer/pywb :target: https://travis-ci.org/ikreymer/pywb
.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=master .. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=develop
:target: https://coveralls.io/r/ikreymer/pywb?branch=master :target: https://coveralls.io/r/ikreymer/pywb?branch=develop
pywb is a python implementation of web archival replay tools, sometimes also known as 'Wayback Machine'. pywb is a python implementation of web archival replay tools, sometimes also known as 'Wayback Machine'.

View File

@ -109,7 +109,6 @@ class JSLinkOnlyRewriter(RegexRewriter):
def __init__(self, rewriter, rules=[]): def __init__(self, rewriter, rules=[]):
rules = rules + [ rules = rules + [
#(self.JS_HTTPX, rewriter.get_abs_url(), 0)
(self.JS_HTTPX, RegexRewriter.archival_rewrite(rewriter), 0) (self.JS_HTTPX, RegexRewriter.archival_rewrite(rewriter), 0)
] ]
super(JSLinkOnlyRewriter, self).__init__(rules) super(JSLinkOnlyRewriter, self).__init__(rules)
@ -129,11 +128,14 @@ class JSLinkAndLocationRewriter(JSLinkOnlyRewriter):
(r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0), (r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
#todo: move to mixin? #todo: move to mixin?
(r'(?:[\s=()]|^)(top)(?:[\s!=()]|$)',
RegexRewriter.add_prefix(prefix), 1),
(r'(?<=window\.)top', (r'(?<=window\.)top',
RegexRewriter.add_prefix(prefix), 0), RegexRewriter.add_prefix(prefix), 0),
(r'\b(top)\b[!=\W]+(?:self|window)', # (r'\b(top)\b[!=\W]+(?:self|window)',
RegexRewriter.add_prefix(prefix), 1), # RegexRewriter.add_prefix(prefix), 1),
#(r'\b(?:self|window)\b[!=\W]+\b(top)\b', #(r'\b(?:self|window)\b[!=\W]+\b(top)\b',
#RegexRewriter.add_prefix(prefix), 1), #RegexRewriter.add_prefix(prefix), 1),

View File

@ -34,7 +34,7 @@ class PyTest(TestCommand):
setup( setup(
name='pywb', name='pywb',
version='0.4.5', version='0.4.6',
url='https://github.com/ikreymer/pywb', url='https://github.com/ikreymer/pywb',
author='Ilya Kreymer', author='Ilya Kreymer',
author_email='ikreymer@gmail.com', author_email='ikreymer@gmail.com',