Mercurial > kallithea
changeset 8207:141066b8a89a
tests: minor doctest updates for py3
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sat, 25 Jan 2020 20:06:36 +0100 |
parents | 7172f3b0042b |
children | 9948ed9916c4 |
files | kallithea/lib/inifile.py kallithea/lib/markup_renderer.py kallithea/lib/ssh.py kallithea/lib/vcs/backends/git/ssh.py kallithea/lib/vcs/backends/hg/ssh.py kallithea/lib/vcs/utils/helpers.py |
diffstat | 6 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/inifile.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/inifile.py Sat Jan 25 20:06:36 2020 +0100 @@ -72,7 +72,7 @@ ... '[third-section]': {'third_extra': ' 3'}, ... '[fourth-section]': {'fourth_extra': '4', 'fourth': '"four"'}, ... } - >>> print expand(template, mako_variable_values, settings) + >>> print(expand(template, mako_variable_values, settings)) <BLANKLINE> [first-section] <BLANKLINE>
--- a/kallithea/lib/markup_renderer.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/markup_renderer.py Sat Jan 25 20:06:36 2020 +0100 @@ -119,17 +119,17 @@ At last it will just do a simple html replacing new lines with <br/> >>> MarkupRenderer.render('''<img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg">''', '.md') - u'<p><img id="a" src="http://example.com/test.jpg" style="color: red;"></p>' + '<p><img id="a" src="http://example.com/test.jpg" style="color: red;"></p>' >>> MarkupRenderer.render('''<img class="c d" src="file://localhost/test.jpg">''', 'b.mkd') - u'<p><img class="c d"></p>' + '<p><img class="c d"></p>' >>> MarkupRenderer.render('''<a href="foo">foo</a>''', 'c.mkdn') - u'<p><a href="foo">foo</a></p>' + '<p><a href="foo">foo</a></p>' >>> MarkupRenderer.render('''<script>alert(1)</script>''', 'd.mdown') - u'<script>alert(1)</script>' + '<script>alert(1)</script>' >>> MarkupRenderer.render('''<div onclick="alert(2)">yo</div>''', 'markdown') - u'<div>yo</div>' + '<div>yo</div>' >>> MarkupRenderer.render('''<a href="javascript:alert(3)">yo</a>''', 'md') - u'<p><a>yo</a></p>' + '<p><a>yo</a></p>' """ renderer = cls._detect_renderer(source, filename) @@ -168,23 +168,23 @@ with "safe" fall-back to plaintext. Output from this method should be sanitized before use. >>> MarkupRenderer.markdown('''<img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg">''') - u'<p><img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg"></p>' + '<p><img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg"></p>' >>> MarkupRenderer.markdown('''<img class="c d" src="file://localhost/test.jpg">''') - u'<p><img class="c d" src="file://localhost/test.jpg"></p>' + '<p><img class="c d" src="file://localhost/test.jpg"></p>' >>> MarkupRenderer.markdown('''<a href="foo">foo</a>''') - u'<p><a href="foo">foo</a></p>' + '<p><a href="foo">foo</a></p>' >>> MarkupRenderer.markdown('''<script>alert(1)</script>''') - u'<script>alert(1)</script>' + '<script>alert(1)</script>' >>> MarkupRenderer.markdown('''<div onclick="alert(2)">yo</div>''') - u'<div onclick="alert(2)">yo</div>' + '<div onclick="alert(2)">yo</div>' >>> MarkupRenderer.markdown('''<a href="javascript:alert(3)">yo</a>''') - u'<p><a href="javascript:alert(3)">yo</a></p>' + '<p><a href="javascript:alert(3)">yo</a></p>' >>> MarkupRenderer.markdown('''## Foo''') - u'<h2>Foo</h2>' - >>> print MarkupRenderer.markdown(''' + '<h2>Foo</h2>' + >>> print(MarkupRenderer.markdown(''' ... #!/bin/bash ... echo "hello" - ... ''') + ... ''')) <table class="code-highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1 2</pre></div></td><td class="code"><div class="code-highlight"><pre><span></span><span class="ch">#!/bin/bash</span> <span class="nb">echo</span> <span class="s2">"hello"</span>
--- a/kallithea/lib/ssh.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/ssh.py Sat Jan 25 20:06:36 2020 +0100 @@ -44,32 +44,32 @@ >>> parse_pub_key('') Traceback (most recent call last): ... - SshKeyParseError: SSH key is missing + kallithea.lib.ssh.SshKeyParseError: SSH key is missing >>> parse_pub_key('''AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''') Traceback (most recent call last): ... - SshKeyParseError: Incorrect SSH key - it must have both a key type and a base64 part, like 'ssh-rsa ASRNeaZu4FA...xlJp=' + kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - it must have both a key type and a base64 part, like 'ssh-rsa ASRNeaZu4FA...xlJp=' >>> parse_pub_key('''abc AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''') Traceback (most recent call last): ... - SshKeyParseError: Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)' + kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)' >>> parse_pub_key('''ssh-rsa AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ''') Traceback (most recent call last): ... - SshKeyParseError: Incorrect SSH key - failed to decode base64 part 'AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ' + kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - failed to decode base64 part 'AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ' >>> parse_pub_key('''ssh-rsa AAAAB2NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ==''') Traceback (most recent call last): ... - SshKeyParseError: Incorrect SSH key - base64 part is not 'ssh-rsa' as claimed but 'csh-rsa' + kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - base64 part is not 'ssh-rsa' as claimed but 'csh-rsa' >>> parse_pub_key('''ssh-rsa AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ''') Traceback (most recent call last): ... - SshKeyParseError: Incorrect SSH key - unexpected characters in base64 part "AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ" + kallithea.lib.ssh.SshKeyParseError: Incorrect SSH key - unexpected characters in base64 part "AAAAB3NzaC1yc2EAAAA'LVGhpcyBpcyBmYWtlIQ" >>> parse_pub_key(''' ssh-rsa AAAAB3NzaC1yc2EAAAALVGhpcyBpcyBmYWtlIQ== and a comment ... ''') - ('ssh-rsa', '\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x0bThis is fake!', 'and a comment\n') + ('ssh-rsa', b'\x00\x00\x00\x07ssh-rsa\x00\x00\x00\x0bThis is fake!', 'and a comment\n') >>> parse_pub_key('''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP1NA2kBQIKe74afUXmIWD9ByDYQJqUwW44Y4gJOBRuo''') - ('ssh-ed25519', '\x00\x00\x00\x0bssh-ed25519\x00\x00\x00 \xfdM\x03i\x01@\x82\x9e\xef\x86\x9fQy\x88X?A\xc86\x10&\xa50[\x8e\x18\xe2\x02N\x05\x1b\xa8', '') + ('ssh-ed25519', b'\x00\x00\x00\x0bssh-ed25519\x00\x00\x00 \xfdM\x03i\x01@\x82\x9e\xef\x86\x9fQy\x88X?A\xc86\x10&\xa50[\x8e\x18\xe2\x02N\x05\x1b\xa8', '') """ if not ssh_key: raise SshKeyParseError(_("SSH key is missing"))
--- a/kallithea/lib/vcs/backends/git/ssh.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/vcs/backends/git/ssh.py Sat Jan 25 20:06:36 2020 +0100 @@ -32,15 +32,15 @@ >>> import shlex >>> GitSshHandler.make(shlex.split("git-upload-pack '/foo bar'")).repo_name - u'foo bar' + 'foo bar' >>> GitSshHandler.make(shlex.split("git-upload-pack '/foo bar'")).verb 'git-upload-pack' >>> GitSshHandler.make(shlex.split(" git-upload-pack /blåbærgrød ")).repo_name # might not be necessary to support no quoting ... but we can - u'bl\xe5b\xe6rgr\xf8d' + 'bl\xe5b\xe6rgr\xf8d' >>> GitSshHandler.make(shlex.split('''git-upload-pack "/foo'bar"''')).repo_name - u"foo'bar" + "foo'bar" >>> GitSshHandler.make(shlex.split("git-receive-pack '/foo'")).repo_name - u'foo' + 'foo' >>> GitSshHandler.make(shlex.split("git-receive-pack '/foo'")).verb 'git-receive-pack'
--- a/kallithea/lib/vcs/backends/hg/ssh.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/vcs/backends/hg/ssh.py Sat Jan 25 20:06:36 2020 +0100 @@ -34,11 +34,11 @@ >>> import shlex >>> MercurialSshHandler.make(shlex.split('hg -R "foo bar" serve --stdio')).repo_name - u'foo bar' + 'foo bar' >>> MercurialSshHandler.make(shlex.split(' hg -R blåbærgrød serve --stdio ')).repo_name - u'bl\xe5b\xe6rgr\xf8d' + 'bl\xe5b\xe6rgr\xf8d' >>> MercurialSshHandler.make(shlex.split('''hg -R 'foo"bar' serve --stdio''')).repo_name - u'foo"bar' + 'foo"bar' >>> MercurialSshHandler.make(shlex.split('/bin/hg -R "foo" serve --stdio')) >>> MercurialSshHandler.make(shlex.split('''hg -R "foo"bar" serve --stdio''')) # ssh-serve will report: Error parsing SSH command "...": invalid syntax
--- a/kallithea/lib/vcs/utils/helpers.py Sat Dec 28 15:05:53 2019 +0100 +++ b/kallithea/lib/vcs/utils/helpers.py Sat Jan 25 20:06:36 2020 +0100 @@ -131,7 +131,7 @@ >>> parse_changesets('aaabbb') {'start': None, 'main': 'aaabbb', 'end': None} >>> parse_changesets('aaabbb..cccddd') - {'start': 'aaabbb', 'main': None, 'end': 'cccddd'} + {'start': 'aaabbb', 'end': 'cccddd', 'main': None} """ text = text.strip()