Skip to content
This repository has been archived by the owner on Jun 18, 2020. It is now read-only.

Commit

Permalink
Merge tag '0.11.6.1' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
@kcrisman
kcrisman committed Dec 15, 2015
2 parents 0bf3eab + 0ced65e commit 8faa464
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 26 deletions.
3 changes: 3 additions & 0 deletions Changes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.11.6.1 Dec 14 2015
- fix doctests

0.11.6 Dec 12 2015
- pexpect upgrade
- fixes for autoescape
Expand Down
50 changes: 25 additions & 25 deletions sagenb/notebook/docHTMLProcessor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def process_doc_html(self, doc_in):
sage: len(txt)
51
sage: txt
'<h1 class="title">Title</h1>\n\n<p>nSome text</p>\n\n\n\n'
u'<h1 class="title">Title</h1>\n\n<p>nSome text</p>\n\n\n\n'
"""
# self.feed() is a SGMLParser method and starts everything
Expand Down Expand Up @@ -197,7 +197,7 @@ def hand_off_temp_pieces(self, piece_type):
sage: p.temp_pieces = ['bunch ', 'of ', 'tmp ', 'strings']
sage: p.hand_off_temp_pieces('to_doc_pieces')
sage: p.all_pieces
'a lot of stuff done bunch of tmp strings'
u'a lot of stuff done bunch of tmp strings'
sage: p.temp_pieces
[]
Expand Down Expand Up @@ -321,7 +321,7 @@ def process_cell_input_output(self, cell_piece):
sage: p = docutilsHTMLProcessor()
sage: s = "s" + "age: 4 + 4\n8" # avoid the doctest script to parse "sage:"
sage: p.process_cell_input_output(s)
'\n{{{id=0|\n4 + 4\n///\n8\n}}}\n\n'
u'\n{{{id=0|\n4 + 4\n///\n8\n}}}\n\n'
sage: print p.process_cell_input_output(s)
{{{id=1|
4 + 4
Expand Down Expand Up @@ -424,7 +424,7 @@ def unknown_starttag(self, tag, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<style type="text/css">']
['bunch ', 'of ', 'tmp ', 'strings', u'<style type="text/css">']
"""
if self.keep_data:
strattrs = "".join([' %s="%s"' % (key, value) for key, value in attrs])
Expand All @@ -447,7 +447,7 @@ def unknown_endtag(self, tag):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '</head>']
['bunch ', 'of ', 'tmp ', 'strings', u'</head>']
"""
if self.keep_data:
self.temp_pieces.append("</%(tag)s>" % locals())
Expand Down Expand Up @@ -490,7 +490,7 @@ def handle_charref(self, ref):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '&#160;']
['bunch ', 'of ', 'tmp ', 'strings', u'&#160;']
"""
if self.keep_data:
self.temp_pieces.append("&#%(ref)s;" % locals())
Expand All @@ -512,7 +512,7 @@ def handle_entityref(self, ref):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '&160']
['bunch ', 'of ', 'tmp ', 'strings', u'&160']
"""
if self.keep_data:
self.temp_pieces.append("&%(ref)s" % locals())
Expand All @@ -535,7 +535,7 @@ def handle_comment(self, data):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<!--important comment-->']
['bunch ', 'of ', 'tmp ', 'strings', u'<!--important comment-->']
"""
if self.keep_data:
self.temp_pieces.append("<!--%(data)s-->" % locals())
Expand All @@ -558,7 +558,7 @@ def handle_pi(self, text):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<?instructions>']
['bunch ', 'of ', 'tmp ', 'strings', u'<?instructions>']
"""
if self.keep_data:
self.temp_pieces.append("<?%(text)s>" % locals())
Expand All @@ -580,7 +580,7 @@ def handle_decl(self, text):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<!declaration>']
['bunch ', 'of ', 'tmp ', 'strings', u'<!declaration>']
"""
if self.keep_data:
self.temp_pieces.append("<!%(text)s>" % locals())
Expand Down Expand Up @@ -670,7 +670,7 @@ def reset(self):
sage: d.temp_pieces
[]
sage: d.all_pieces
''
u''
sage: d.cellcount
0
"""
Expand Down Expand Up @@ -746,7 +746,7 @@ def start_div(self, attrs):
sage: attrs = [('class', 'highlight')]
sage: p.start_div(attrs)
sage: p.all_pieces
'a lot of stuff done bunch of tmp strings'
u'a lot of stuff done bunch of tmp strings'
sage: p.temp_pieces
[]
sage: p.in_highlight_div
Expand All @@ -763,7 +763,7 @@ def start_div(self, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<div class="something-else">']
['bunch ', 'of ', 'tmp ', 'strings', u'<div class="something-else">']
sage: p.in_highlight_div
False
"""
Expand Down Expand Up @@ -824,7 +824,7 @@ def end_div(self):
sage: print p.all_pieces
a lot of stuff done
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<div class="something-else">', 'some data', '</div>']
['bunch ', 'of ', 'tmp ', 'strings', u'<div class="something-else">', 'some data', u'</div>']
sage: p.in_highlight_div
False
Expand Down Expand Up @@ -871,7 +871,7 @@ def start_pre(self, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<pre>']
['bunch ', 'of ', 'tmp ', 'strings', u'<pre>']
"""
if self.in_highlight_div:
return
Expand Down Expand Up @@ -905,7 +905,7 @@ def end_pre(self):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '</pre>']
['bunch ', 'of ', 'tmp ', 'strings', u'</pre>']
"""
if self.in_highlight_div:
return
Expand All @@ -931,7 +931,7 @@ def start_form(self, attrs):
sage: attrs = []
sage: p.start_form(attrs)
sage: p.all_pieces
'a lot of stuff done bunch of tmp strings'
u'a lot of stuff done bunch of tmp strings'
sage: p.temp_pieces
[]
"""
Expand Down Expand Up @@ -994,7 +994,7 @@ def start_span(self, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<span>']
['bunch ', 'of ', 'tmp ', 'strings', u'<span>']
"""
if self.in_highlight_div:
return
Expand Down Expand Up @@ -1027,7 +1027,7 @@ def end_span(self):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '</span>']
['bunch ', 'of ', 'tmp ', 'strings', u'</span>']
"""
if self.in_highlight_div:
return
Expand Down Expand Up @@ -1109,7 +1109,7 @@ def reset(self):
sage: d.temp_pieces
[]
sage: d.all_pieces
''
u''
sage: d.cellcount
0
"""
Expand Down Expand Up @@ -1181,7 +1181,7 @@ def start_pre(self, attrs):
sage: attrs = [('class', 'literal-block')]
sage: p.start_pre(attrs)
sage: p.all_pieces
'a lot of stuff done bunch of tmp strings'
u'a lot of stuff done bunch of tmp strings'
sage: p.temp_pieces
[]
sage: p.in_pre_litteral_block
Expand All @@ -1198,7 +1198,7 @@ def start_pre(self, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<pre class="something-else">']
['bunch ', 'of ', 'tmp ', 'strings', u'<pre class="something-else">']
sage: p.in_pre_litteral_block
False
"""
Expand Down Expand Up @@ -1256,7 +1256,7 @@ def end_pre(self):
sage: print p.all_pieces
a lot of stuff done
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '<pre class="something-else">', 'some data', '</pre>']
['bunch ', 'of ', 'tmp ', 'strings', u'<pre class="something-else">', 'some data', u'</pre>']
sage: p.in_pre_litteral_block
False
"""
Expand Down Expand Up @@ -1333,7 +1333,7 @@ def start_cite(self, attrs):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '$']
['bunch ', 'of ', 'tmp ', 'strings', u'$']
"""
self.temp_pieces.append("$")
return
Expand All @@ -1353,7 +1353,7 @@ def end_cite(self):
sage: p.all_pieces
'a lot of stuff done '
sage: p.temp_pieces
['bunch ', 'of ', 'tmp ', 'strings', '$', 'x^2', '$']
['bunch ', 'of ', 'tmp ', 'strings', u'$', 'x^2', u'$']
"""
self.temp_pieces.append("$")
return
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def all_files(dir, prefix):
distutils.log.set_threshold(distutils.log.DEBUG)

code = setup(name = 'sagenb',
version = '0.11.6',
version = '0.11.6.1',
description = 'The Sage Notebook',
license = 'GNU General Public License (GPL) v3+',
author = 'William Stein et al.',
Expand Down

0 comments on commit 8faa464

Please sign in to comment.