aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmcv <smcv@web>2014-09-04 06:47:06 -0400
committeradmin <admin@branchable.com>2014-09-04 06:47:06 -0400
commit34c7cad9926c2d4d75f3b99593ae81cc01d84080 (patch)
tree63e517be4638052b53fb6b13d41a2a216e726214
parent538b73a802c9a6cbf14627b1012d030bf0d70c3d (diff)
downloadikiwiki-34c7cad9926c2d4d75f3b99593ae81cc01d84080.tar
ikiwiki-34c7cad9926c2d4d75f3b99593ae81cc01d84080.tar.gz
new version of branch to fix Python 3
-rw-r--r--doc/bugs/pythonproxy-utf8_again.mdwn11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/bugs/pythonproxy-utf8_again.mdwn b/doc/bugs/pythonproxy-utf8_again.mdwn
index 8269a9bea..0434e3684 100644
--- a/doc/bugs/pythonproxy-utf8_again.mdwn
+++ b/doc/bugs/pythonproxy-utf8_again.mdwn
@@ -1,4 +1,6 @@
[[!template id=gitbranch branch=chrysn/more-proxy-utf8-fail author="[[chrysn]]"]]
+[[!template id=gitbranch author="[[chrysn]], [[smcv]]" branch=smcv/ready/more-proxy-utf8-fail
+ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/more-proxy-utf8-fail]]
the recently introduced fixes for [[crashes in the python proxy even if disabled]]
caused the typical python2 implicit conversion failures ("'ascii' codec
@@ -54,6 +56,9 @@ patch.
>>> ancient module.) --[[chrysn]]
>>>> You were right about this, `encode` is appropriate to go from `unicode`
->>>> to `str` under Python 2. I'm a bit concerned that it might break
->>>> Python 3 (see also [[bugs/rst_plugin_hangs_when_used_with_Python_3]]).
->>>> Testing now. --[[smcv]]
+>>>> to `str` under Python 2. However, Python 3 is still broken.
+>>>>
+>>>> My `ready/more-proxy-utf8-fail` branch, based on yours,
+>>>> [[fixes the`rst` test when run under Python 3|bugs/rst_plugin_hangs_when_used_with_Python_3]]
+>>>> and hopefully also fixes this one. Please check that it still
+>>>> fixes your test-case too. --[[smcv]]