1 2010-07-17T00:02:37 <dreimark> omg
2 2010-07-17T00:03:18 <dreimark> that can happen evrywhere
3 2010-07-17T00:11:21 <valeuf> ThomasWaldmann: ok a lot of comments :p
4 2010-07-17T00:12:45 <valeuf> ThomasWaldmann: so first of all, about the mimetype
5 2010-07-17T00:12:53 <ThomasWaldmann> valeuf: hg diff moin/2.0-dev moin/2.0-yours
6 2010-07-17T00:13:07 <valeuf> ThomasWaldmann: ?
7 2010-07-17T00:13:21 <valeuf> ThomasWaldmann: so about the mimetype, I choose to use application/docbook+xml
8 2010-07-17T00:13:49 <valeuf> after some advice from #docbook, and what I read, especially an this page : http://www.docbook.org/tdg/en/html/ch04.html
9 2010-07-17T00:14:28 <valeuf> I will fix the comments now to explain more correctly, I agree that I probably did not explain well
10 2010-07-17T00:14:37 <ThomasWaldmann> ok, so you fix that other mimetype?
11 2010-07-17T00:14:47 <valeuf> for HTML mimetype
12 2010-07-17T00:14:53 <valeuf> I still wait for your choice actually
13 2010-07-17T00:15:07 <valeuf> from my point of view, it should be use for unsafe-html
14 2010-07-17T00:15:31 <valeuf> since the html will be processed, we can ensure to have a safe html displayed at the end
15 2010-07-17T00:15:44 <valeuf> safe HTML should not have any conversion, and should be directly displayed at the end
16 2010-07-17T00:16:12 <valeuf> I will update the docs/CHANGES* files
17 2010-07-17T00:16:23 <valeuf> I should say I completely forget about it, sorry for that
18 2010-07-17T00:16:38 <ThomasWaldmann> i mean you are using 2 different docbook mimetypes
19 2010-07-17T00:18:15 <valeuf> ThomasWaldmann: ah yes, actually this also another problem I forget to ask you
20 2010-07-17T00:18:31 <valeuf> ThomasWaldmann: you were using text/docbook mimetype before (for Moin 1.x)
21 2010-07-17T00:18:47 <valeuf> ThomasWaldmann: so I use it for some compatibility in the link, but it is quite stupid
22 2010-07-17T00:19:07 <valeuf> ThomasWaldmann: so can I choose application/docbook+xml for all ?
23 2010-07-17T00:19:15 <ThomasWaldmann> yes
24 2010-07-17T00:19:20 <valeuf> ok
25 2010-07-17T00:20:18 <valeuf> well, I am going to make the changes right now, and anyway I will bo working on the DocBook converter, so if you have some other problem with my code
26 2010-07-17T00:20:28 <valeuf> feel you free to tell, I will try my best to fix it
27 2010-07-17T00:21:02 <ThomasWaldmann> make a separate ws cleanup changeset
28 2010-07-17T00:21:32 <valeuf> ?
29 2010-07-17T00:21:56 <ThomasWaldmann> empty lines after method docstrings
30 2010-07-17T00:22:05 <valeuf> ok
31 2010-07-17T00:22:09 <ThomasWaldmann> no ...
32 2010-07-17T00:22:41 <valeuf> so do you want I merge first, and then I edit my code, to fix the different problem ?
33 2010-07-17T00:23:02 <ThomasWaldmann> first clean up, merge main repo again
34 2010-07-17T00:23:16 <diofeher> ThomasWaldmann: when user tried to access userprefs, what msg should appear?
35 2010-07-17T00:23:26 <valeuf> ok
36 2010-07-17T00:23:29 <diofeher> these functions _create_pages are returning None
37 2010-07-17T00:23:45 <ThomasWaldmann> diofeher: userprefs should appear :)
38 2010-07-17T00:23:53 <diofeher> no msg?
39 2010-07-17T00:24:06 <ThomasWaldmann> "you klicked on userprefs, here it is:"
40 2010-07-17T00:24:24 * ThomasWaldmann just joking
41 2010-07-17T00:24:31 <diofeher> haha
42 2010-07-17T00:24:46 <diofeher> but i don't see a good message to put there...
43 2010-07-17T00:24:52 <ThomasWaldmann> no msg
44 2010-07-17T00:28:17 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8729:a6bc5cdd5bfe 2.0-dev-jinja2-plugins-dfeher/MoinMoin/action/userprefs.py: [templating] removed add_msg in userprefs and refactored _create_pages to not return msg
45 2010-07-17T00:35:08 *** RogerHaase
46 2010-07-17T00:35:12 <ThomasWaldmann> http://localhost:8080/foo?do=userprefs looks strange with no bottom editbar, we'll need some <hr> or something there later
47 2010-07-17T00:35:30 <diofeher> ok ^^
48 2010-07-17T00:35:35 <diofeher> in footer
49 2010-07-17T00:35:36 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8730:55542e54086e 2.0-dev-jinja2-plugins-dfeher/MoinMoin/templates/rc.html: [templating] fixed recent changes action
50 2010-07-17T00:37:09 <valeuf> ok some commits to fix the docstrings
51 2010-07-17T00:37:30 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8692:448a28f0d1c5 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/html_in.py: Improve docstring for html_in converter
52 2010-07-17T00:37:33 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8693:b33ec660fdd5 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/html_in.py: Remove empty line after method docstring
53 2010-07-17T00:37:34 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8694:455a2cb77e2b 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_out.py: Improve Docstring for DocBook_OUT converter
54 2010-07-17T00:37:35 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8695:2d6b697ccd47 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_out.py: Remove empty line after method docstring for DocBook_OUT converter
55 2010-07-17T00:37:36 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8696:f78a0e4560b3 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_in.py: Improve DocString for DocBook_IN converter
56 2010-07-17T00:37:38 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8697:befccc013927 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_in.py: Remove empty line after method docstring for DocBook_IN converter
57 2010-07-17T00:37:50 <valeuf> I will have a look for the mimetype problem
58 2010-07-17T00:38:00 <valeuf> you want we use anoter action than do_get for that ThomasWaldmann ?
59 2010-07-17T00:38:10 <valeuf> ThomasWaldmann: the answer of xorAxAx was not really clear !
60 2010-07-17T00:38:42 <xorAxAx> valeuf: which answer?
61 2010-07-17T00:38:45 <ThomasWaldmann> valeuf: yeah
62 2010-07-17T00:38:52 <valeuf> and so do I use unsafe-html to replace my dummy type ?
63 2010-07-17T00:39:00 <xorAxAx> ThomasWaldmann: well, he said that he modified only one place on the trunk
64 2010-07-17T00:39:17 <ThomasWaldmann> 23:21
65 2010-07-17T00:39:39 <valeuf> ok
66 2010-07-17T00:39:50 <ThomasWaldmann> do=get was intented to serve raw revision content
67 2010-07-17T00:40:06 <ThomasWaldmann> and it got a bit more complex due to 304 handling
68 2010-07-17T00:40:25 <ThomasWaldmann> then more complex due to tarfile container and caching support
69 2010-07-17T00:40:45 <ThomasWaldmann> i don't think we should make it even more complex by adding conversions
70 2010-07-17T00:41:19 <ThomasWaldmann> *intended
71 2010-07-17T00:41:31 <valeuf> well, let's use something like do_convert so ?
72 2010-07-17T00:41:54 <ThomasWaldmann> imho yes
73 2010-07-17T00:42:17 <ThomasWaldmann> also, it maybe should be a long if-else for every mimetype
74 2010-07-17T00:42:22 <ThomasWaldmann> +not
75 2010-07-17T00:42:47 <ThomasWaldmann> but just check if there is a conversion path from existing mimetype to wanted mimetype
76 2010-07-17T00:43:16 <valeuf> ThomasWaldmann: it well take a little more time to implement the do_convert action, but I can do that tomorrow
77 2010-07-17T00:44:07 <ThomasWaldmann> ok, for now just revert the do_get stuff, so it doesn't change main repo file at that place
78 2010-07-17T00:44:55 <valeuf> ThomasWaldmann: ok no problem, I will remove it from the code for tonight, it is not really important
79 2010-07-17T00:45:22 <ThomasWaldmann> http://www.bannerblog.com.au/news/picts/funny-pictures-kitten-is-excited-about-bacon.jpg
80 2010-07-17T00:45:28 <ThomasWaldmann> s/bacon/moin2/ ?
81 2010-07-17T00:46:12 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8731:8a2c03fda111 2.0-dev-jinja2-plugins-dfeher/MoinMoin/action/ (login.py logout.py): [templating] fixed login and logout. showing current item below msg
82 2010-07-17T00:46:17 <valeuf> ThomasWaldmann: ar you like that cat ?
83 2010-07-17T00:46:31 <ThomasWaldmann> no, bigger and older :P
84 2010-07-17T00:46:41 <valeuf> ThomasWaldmann: ^ ^
85 2010-07-17T00:46:43 <ThomasWaldmann> and less hair :D
86 2010-07-17T00:47:18 * ThomasWaldmann thinks about a lightning talk
87 2010-07-17T00:48:52 <aa_> dreimark: can you add me to the disabled gruop for all instances of moin?
88 2010-07-17T00:49:05 <aa_> ThomasWaldmann: when are you arriving?
89 2010-07-17T00:49:20 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8698:dda6d0b30418 2.0-dev-docbook-html-vjaniaut/MoinMoin/ (converter2/html_in.py items/__init__.py): Use the unsafe html mimetype with HTML_IN converter instead of the dummy mimetype
90 2010-07-17T00:49:20 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8699:9fc2d41ff405 2.0-dev-docbook-html-vjaniaut/MoinMoin/items/__init__.py: Get rid of the text/x.moin.html mimetype which was for test purpose
91 2010-07-17T00:50:10 <valeuf> ok, now there is no anymore mention to the weird text/x.moin.html mimetype ^ ^ I am pretty happy about it !
92 2010-07-17T00:55:28 <diofeher> ThomasWaldmann: fix rendering (note that there is no blank after the item name): FooBar(edited 2010-07-16 08:46:54 by localhost)
93 2010-07-17T00:55:33 <diofeher> this already fixed oO
94 2010-07-17T00:55:47 <diofeher> LanguageSetup(edited 2010-07-14 01:01:09 by 0)
95 2010-07-17T00:57:07 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8700:d538360216b5 2.0-dev-docbook-html-vjaniaut/MoinMoin/items/__init__.py: Remove conversion in the do_get action
96 2010-07-17T00:57:09 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8701:bea152a18919 2.0-dev-docbook-html-vjaniaut/docs/CHANGES.html-docbook: Update CHANGES document to reflect more the change in the repository
97 2010-07-17T00:58:01 <diofeher> i can move username to render directly in template.. gonna put in layout.html
98 2010-07-17T00:58:03 *** grzywacz
99 2010-07-17T00:58:07 <diofeher> can i do this? :)
100 2010-07-17T00:59:13 <ThomasWaldmann> valeuf: http://hg.moinmo.in/moin/2.0-dev-docbook-html-vjaniaut/file/bea152a18919/docs/CHANGES this is the format it should have
101 2010-07-17T01:00:05 <ThomasWaldmann> diofeher: try and publish diff for review
102 2010-07-17T01:00:32 <ThomasWaldmann> you could also first split it and then try
103 2010-07-17T01:01:09 <valeuf> ox, by the way I merged with moin2 repos, without any trouble, I could run all the unit tests in converter2 and in MoinMoin successfully
104 2010-07-17T01:01:24 <ThomasWaldmann> cool :)
105 2010-07-17T01:03:23 <valeuf> CHANGES file like this : http://paste.pocoo.org/show/238530/ does it looks better ?
106 2010-07-17T01:04:18 <valeuf> do you want I add New feature: line ?
107 2010-07-17T01:11:25 <ThomasWaldmann> yes
108 2010-07-17T01:14:26 <ThomasWaldmann> aa_: Sun late evening
109 2010-07-17T01:16:11 <diofeher> ThomasWaldmann: http://paste.pocoo.org/show/238531/
110 2010-07-17T01:16:38 <diofeher> working 100% :D
111 2010-07-17T01:16:59 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8736:456801cd6f60 2.0-dev-docbook-html-vjaniaut/ (1591 files in 198 dirs): Merge against main moin/2.0-dev repo
112 2010-07-17T01:17:00 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8737:03b74e4ec8a6 2.0-dev-docbook-html-vjaniaut/docs/CHANGES.html-docbook: Rewrite correctly CHANGES documentation for the repo
113 2010-07-17T01:17:37 <valeuf> ok, I think I fixed all the problem you pointed out
114 2010-07-17T01:17:52 <ThomasWaldmann> diofeher: not complete yet
115 2010-07-17T01:17:56 <diofeher> i know
116 2010-07-17T01:18:07 <diofeher> remaining two items :)
117 2010-07-17T01:18:14 <diofeher> but it's ok for now?
118 2010-07-17T01:18:18 <diofeher> is it*
119 2010-07-17T01:18:33 <ThomasWaldmann> and you forgot to escape
120 2010-07-17T01:19:03 <valeuf> escape ?
121 2010-07-17T01:19:09 <valeuf> escape what ?
122 2010-07-17T01:20:00 <ThomasWaldmann> that was for diofeher (the url)
123 2010-07-17T01:20:25 <valeuf> ah sorry
124 2010-07-17T01:28:07 <valeuf> ThomasWaldmann: what do you think of two kind of conversion action
125 2010-07-17T01:28:17 <valeuf> one to get the result of the conversion
126 2010-07-17T01:28:30 <valeuf> one the save the result of the conversion as a new item
127 2010-07-17T01:29:00 <valeuf> (so we can for instance convert definitively a DocBook document into a document using Moinmoin syntax)
128 2010-07-17T01:29:09 <ThomasWaldmann> why is all called visit_xhtml_* if it is html4?
129 2010-07-17T01:30:23 <ThomasWaldmann> your new convert action can convert for get and post :)
130 2010-07-17T01:31:27 <valeuf> ThomasWaldmann: because we are using this namespace http://www.w3.org/1999/xhtml
131 2010-07-17T01:31:46 <valeuf> so actually I should say that it support html4 and xhtml document
132 2010-07-17T01:32:07 <ThomasWaldmann> html is not xml, how does it work?
133 2010-07-17T01:32:11 <valeuf> there is no namespace for html4
134 2010-07-17T01:33:28 <valeuf> ThomasWaldmann: emerald tree allow to load HTML document as a tree
135 2010-07-17T01:33:52 <ThomasWaldmann> ah
136 2010-07-17T01:34:03 <ThomasWaldmann> did you test it with moin 1.9 output?
137 2010-07-17T01:34:23 <valeuf> however, I need to make clear the point of the namespace, since HTML4 element can have some problem with the lack of namespace
138 2010-07-17T01:34:56 <valeuf> ThomasWaldmann: yes
139 2010-07-17T01:34:59 <valeuf> http://moinmo.in/DOM%20DocBook%20and%20HTML%202010/HTML-DOM/Tests
140 2010-07-17T01:35:17 <valeuf> from the moin syntax reference
141 2010-07-17T01:35:59 <valeuf> I just use the output of the page from moinmo.in (i only kept the div with the data, to avoid to have the menu and all the other stuff around)
142 2010-07-17T01:36:02 <diofeher> done http://paste.pocoo.org/show/238540/
143 2010-07-17T01:36:10 <diofeher> ThomasWaldmann ^^
144 2010-07-17T01:36:33 <ThomasWaldmann> valeuf: ok
145 2010-07-17T01:38:41 <valeuf> ThomasWaldmann: but you are right, I mainly target XHTML document, the support of HTML4 is just of result of the support of XHTML
146 2010-07-17T01:39:02 <valeuf> so it would be better for me to change the docstring according to this remark
147 2010-07-17T01:39:09 <ThomasWaldmann> wiki_url is a bad name
148 2010-07-17T01:39:15 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8738:070c48fbd045 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/html_in.py: Replace HTML4 by XHTML in the docstring for html_in converter
149 2010-07-17T01:40:10 <dreimark> aa_: haha
150 2010-07-17T01:40:34 <dreimark> gn
151 2010-07-17T01:41:11 <ThomasWaldmann> diofeher: still missing escaping
152 2010-07-17T01:41:32 <valeuf> ThomasWaldmann: ok I am going to sleep now but let me your feedback on IRC, I will backlog tomorrow morning
153 2010-07-17T01:41:38 <diofeher> i'm going to change to userhome
154 2010-07-17T01:41:39 <valeuf> ThomasWaldmann: and I will add the do_convert too
155 2010-07-17T01:42:17 <diofeher> so, it's done :D
156 2010-07-17T01:42:22 <diofeher> wiki_url -> userhome()
157 2010-07-17T01:42:27 <diofeher> and urls escaped
158 2010-07-17T01:47:29 <ThomasWaldmann> ok
159 2010-07-17T01:51:29 <diofeher> bbl
160 2010-07-17T01:51:34 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8732:3b15874eb0ef 2.0-dev-jinja2-plugins-dfeher/MoinMoin/ (templates/layout.html theme/__init__.py): [templating] get rid of user_breadcrumbs and render directly in template. created userhome() and login_url property
161 2010-07-17T01:55:58 *** eSyr
162 2010-07-17T01:55:59 *** stymo
163 2010-07-17T01:59:48 *** eSyr
164 2010-07-17T01:59:48 *** stymo
165 2010-07-17T09:25:38 <dreimark> ei-grad: DmitryAndreev please add notes to your diaries
166 2010-07-17T09:34:26 <DmitryAndreev> dreimark, a need to fix last bug in recursive version of rst_out converter before I'll be able switch to another activity
167 2010-07-17T10:10:09 <TheSheep> greetings from Birmingham
168 2010-07-17T10:40:58 *** grzywacz
169 2010-07-17T10:46:41 *** kursor
170 2010-07-17T11:40:32 <valeuf> you are already there TheSheep ?
171 2010-07-17T11:44:39 <valeuf> TheSheep: how is the weather ?
172 2010-07-17T11:45:41 <TheSheep> it's raning
173 2010-07-17T11:45:44 <TheSheep> raining
174 2010-07-17T11:45:49 <TheSheep> and it's cold
175 2010-07-17T11:45:51 <TheSheep> :(
176 2010-07-17T11:46:08 <TheSheep> take warm clothes
177 2010-07-17T11:46:13 <TheSheep> and something waterproof
178 2010-07-17T11:47:01 <valeuf> TheSheep: \o/ am I the only guy who leave hot and sunny place for rainy and foggy city?
179 2010-07-17T11:48:03 <TheSheep> valeuf: it was hot and sunny in Poznan
180 2010-07-17T11:51:53 *** kursor
181 2010-07-17T11:52:53 <dreimark> TheSheep: is it really that cold ?
182 2010-07-17T11:53:08 <dreimark> 20 deg or less?
183 2010-07-17T11:55:14 <dreimark> sounds like we need geek sweaters instead of t-shirts
184 2010-07-17T11:55:27 <TheSheep> it's not bad indoors
185 2010-07-17T11:59:21 <dreimark> http://www.bbc.co.uk/birmingham/content/webcams/mailbox_webcam.shtml
186 2010-07-17T11:59:26 <dreimark> http://www.bbc.co.uk/birmingham/content/webcams/bullring_outside_webcam.shtml
187 2010-07-17T12:01:35 <dreimark> TheSheep: where did you get wifi from, the venue?
188 2010-07-17T12:04:40 <TheSheep> yes
189 2010-07-17T12:26:17 <ThomasWaldmann> moin
190 2010-07-17T14:27:20 <ThomasWaldmann> diofeher: can you fix some trivial stuff that is still wrong before we run out of time?
191 2010-07-17T14:27:57 <ThomasWaldmann> valeuf: you're finished with cleanup?
192 2010-07-17T14:31:32 <valeuf> ThomasWaldmann: let me check once more,
193 2010-07-17T14:32:01 <valeuf> ThomasWaldmann: except the empty line after the docstrings, did you see some other point which not clean in the code?
194 2010-07-17T14:38:10 * ThomasWaldmann reviews again
195 2010-07-17T14:38:41 <ThomasWaldmann> (some stuff you maybe can do yourself, by just diffing all your stuff against main repo and reading it slowly while thinking aboutit)
196 2010-07-17T14:40:23 *** kursor
197 2010-07-17T14:43:23 <CIA-98> Dmitry Andreev <klieg.polar@gmail.com> default * 8546:9a8b7215674b 2.0-dev-wiki-rest-dandreev/ (1624 files in 215 dirs): merge with main 2.0 dev branch
198 2010-07-17T14:43:26 <CIA-98> Dmitry Andreev <klieg.polar@gmail.com> default * 8547:3b21bfed3777 2.0-dev-wiki-rest-dandreev/MoinMoin/converter2/moinwiki_out_recursive.py: detele unused commented code
199 2010-07-17T14:43:28 <CIA-98> Dmitry Andreev <klieg.polar@gmail.com> default * 8548:46fd8597c75d 2.0-dev-wiki-rest-dandreev/MoinMoin/converter2/rst_out_recursive.py: DOM->ReStructuredText: quick and dirty recursive implementation of converter
200 2010-07-17T14:43:30 <CIA-98> Dmitry Andreev <klieg.polar@gmail.com> default * 8549:2b1e1ba8d1f7 2.0-dev-wiki-rest-dandreev/MoinMoin/converter2/_tests/test_rst_out_recursive.py: DOM->ReStructuredText: tests for recursive implementation
201 2010-07-17T14:49:45 <ThomasWaldmann> valeuf: import order: can you reorder so it first does stdlib imports, then support lib imports, then MoinMoin imports?
202 2010-07-17T14:49:57 <ThomasWaldmann> (except if technically required otherwise)
203 2010-07-17T14:51:02 <ThomasWaldmann> + py.test.py.test.skip("lxml module required to run test for html_in_out converter.")
204 2010-07-17T14:51:07 <ThomasWaldmann> huh?
205 2010-07-17T14:53:14 <ThomasWaldmann> +Currently support DocBook v5.
206 2010-07-17T14:53:20 <ThomasWaldmann> supports
207 2010-07-17T14:55:45 <ThomasWaldmann> + if 'ordered' == item_label_generate:
208 2010-07-17T14:55:55 <ThomasWaldmann> are you coding in C/C++ sometimes? :)
209 2010-07-17T14:58:03 <ThomasWaldmann> class Text(Binary):
210 2010-07-17T14:58:09 <ThomasWaldmann> + supported_mimetypes = ['text/', 'application/docbook+xml']
211 2010-07-17T14:58:29 <ThomasWaldmann> is that a remainder from the already remove do_get with convert support?
212 2010-07-17T14:59:26 <ThomasWaldmann> - def _render_data(self):
213 2010-07-17T14:59:26 <ThomasWaldmann> - return self.data_storage_to_internal(self.data)
214 2010-07-17T14:59:26 <ThomasWaldmann> -
215 2010-07-17T14:59:29 <ThomasWaldmann> why?
216 2010-07-17T15:00:20 <ThomasWaldmann> http://paste.pocoo.org/show/238654/ < have a look there yourself. that are all changes that get done if we merge back.
217 2010-07-17T15:00:25 <ThomasWaldmann> valeuf: ^^
218 2010-07-17T15:14:52 *** RogerHaase
219 2010-07-17T15:29:31 <valeuf> ThomasWaldmann: yep, sorry I was away few minutes
220 2010-07-17T15:36:58 *** ritinardo
221 2010-07-17T15:38:10 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8739:3c43353e5115 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_in.py: Reorder import for the DocBook_IN converter
222 2010-07-17T15:38:12 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8740:260b0d1d1ffa 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_html_in_out.py: Rewove weird statement for the HTML_IN_OUT tests
223 2010-07-17T15:41:27 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8741:98e3b97fd61e 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_in.py: Fix english typo
224 2010-07-17T15:42:03 <valeuf> ThomasWaldmann: ok then to reply to your question
225 2010-07-17T15:42:50 <valeuf> yes I am coding with C usually ^ ^ you do not like the way I am doing string tests? Or is it deprecated in Python? if so there is no problem I can change, but I usually like to put string first
226 2010-07-17T15:43:27 <valeuf> then, since a docbook document is a text, I should add the mimetype to the supported mimetype of the Text class for the item
227 2010-07-17T15:43:49 <valeuf> otherwise it would not be handle correctly, so for instance, we would not get the text editor for the DocBook document
228 2010-07-17T15:44:12 <valeuf> so there is no any link with the action to be : do_convert
229 2010-07-17T15:44:29 <valeuf> then, I remove _render_data overidden metho
230 2010-07-17T15:44:51 <valeuf> then, I remove _render_data overidden method from Unsafe HTML
231 2010-07-17T15:45:21 <valeuf> because actually it would directly use the HTML code for the output, with is not safe since we do not know what there is in the HTML
232 2010-07-17T15:45:52 <valeuf> (with the previous code, even with unsafe HTML, user would be able to add javascript or whatever on a page)
233 2010-07-17T15:46:34 <valeuf> so by removing these line, I ensure to use the HTML_IN converter to produce xhtml output (using the HTML_out converter at the end)
234 2010-07-17T15:46:48 * valeuf is reading slowly his code before the merge to find other stupid things ^ ^
235 2010-07-17T15:50:59 <ThomasWaldmann> valeuf: it is no problem to put string first, it just causes little smiles for experienced readers :D
236 2010-07-17T15:51:15 <ThomasWaldmann> (because it is not needed for python, but great for C)
237 2010-07-17T15:52:03 <ThomasWaldmann> valeuf: don't you subclass from text anyway and announce appl/db there?
238 2010-07-17T15:52:59 <valeuf> ThomasWaldmann: ah it is a good point, maybe I did not understood well this part of the code for the items
239 2010-07-17T15:53:03 <valeuf> ThomasWaldmann: let me check
240 2010-07-17T15:55:42 <ThomasWaldmann> valeuf: i am not quite sure about what's the best procedure for html content
241 2010-07-17T15:56:27 <ThomasWaldmann> if one just uses it as is, not much can go wrong (assumine that it doesn't contain stuff which makes it invalid or unsafe)
242 2010-07-17T15:56:54 <ThomasWaldmann> if one puts it through converters, it'll lose everything we don't support in the converters
243 2010-07-17T15:57:35 <valeuf> it is for that I was not sure about the best mimetype to use, and I was using a dummy mimetype, for an HTML explicitely converted with the converter
244 2010-07-17T15:57:45 <valeuf> however it is how I am thinking of the problem
245 2010-07-17T15:58:06 <ThomasWaldmann> we maybe just need 2 or 3 different mimetypes
246 2010-07-17T15:58:24 <valeuf> untrusted user should not be able to add HTML which can be directly displayed without any treatement (the 'safe html')
247 2010-07-17T15:58:27 <ThomasWaldmann> 1. don't touch, i know what i do and am aware of risks
248 2010-07-17T15:58:48 <ThomasWaldmann> 2. pipe through converters to filter out all stuff our DOM does not support
249 2010-07-17T15:58:54 <valeuf> so they can input only unsafe HTML, which is process by the converter, so we can be sure of the result
250 2010-07-17T15:59:05 <ThomasWaldmann> (making it safe, but less versatile)
251 2010-07-17T15:59:39 <valeuf> however, we can naturally see that as two different mimetype : unsafe html can just have some treatment to remove any dangerous/malicious code
252 2010-07-17T15:59:56 <ThomasWaldmann> btw, we still have some "unsafe to safe html conversion" in the code somewhere, is that replaced by your stuff?
253 2010-07-17T16:00:26 <valeuf> and another one can be using the converter, so we can enjoy all the possibilies offered by the DOM converters
254 2010-07-17T16:00:41 <ThomasWaldmann> MoinMoin.parser.text_html
255 2010-07-17T16:02:45 <valeuf> ThomasWaldmann: I do not know, but in the code of item actually, the data of the unsafe HTML was displayed only using : self.data_storage_to_internal(self.data)
256 2010-07-17T16:03:00 <valeuf> which was just decoding the text with correct charset
257 2010-07-17T16:03:07 <ThomasWaldmann> yes, that's why it is unsafe :D
258 2010-07-17T16:03:14 <valeuf> and replacing \r\n by \n :p
259 2010-07-17T16:03:16 <valeuf> yep
260 2010-07-17T16:03:36 <ThomasWaldmann> but some people may want to play with javascript or other unsafe stuff
261 2010-07-17T16:04:01 <ThomasWaldmann> as long as they have appropriate ACLs on that item, it is no problem
262 2010-07-17T16:04:03 <valeuf> do you really think there is the need for the converter AND a formatter to remove unsafe stuff
263 2010-07-17T16:04:21 <ThomasWaldmann> you mean parser?
264 2010-07-17T16:04:49 <valeuf> yes parser sorry
265 2010-07-17T16:05:04 <ThomasWaldmann> no, parsers shall die
266 2010-07-17T16:05:25 <ThomasWaldmann> but we shall have an appropriate replacement
267 2010-07-17T16:05:53 <ThomasWaldmann> so, if you kill the safe text_html parser, make sure your replacement is as safe and as useful :)
268 2010-07-17T16:06:13 <ThomasWaldmann> and then kill the other thing and its support module
269 2010-07-17T16:06:17 <valeuf> because actually the HTML_IN converter will display correctly any HTML input from the WYSISYG editor, except style, but the support of style should not be really complicate for the HTML_IN converter
270 2010-07-17T16:06:59 <valeuf> so I think that two type of HTML are enough (although, we need to clearly explain that safe html should be only for really trusted user)
271 2010-07-17T16:07:08 <ThomasWaldmann> if you mean html style="..." attr - that stuff sucks if you want safety
272 2010-07-17T16:07:14 <valeuf> :D
273 2010-07-17T16:07:36 <ThomasWaldmann> because it allows javascript which can be tarnished in a lot of ways
274 2010-07-17T16:07:46 <valeuf> no I did not intend such of things
275 2010-07-17T16:07:58 <valeuf> I thought about a list of style attribute we support
276 2010-07-17T16:08:36 <ThomasWaldmann> you can look at my (given up) attempts in the moin/extensions repo (span macro)
277 2010-07-17T16:09:16 <valeuf> ok, well maybe I do not see all the problems with the style
278 2010-07-17T16:10:14 <ThomasWaldmann> btw, import order was improvable in all modules
279 2010-07-17T16:12:15 *** ritinardo
280 2010-07-17T16:12:20 <valeuf> my way for the import : stdlib, emerald tree, moinmoin stuffs
281 2010-07-17T16:12:22 <valeuf> *stuff
282 2010-07-17T16:12:37 <valeuf> however, for the Moinmoin stuff, I do not know if there is some preference pour l'ordre
283 2010-07-17T16:13:06 <ThomasWaldmann> no, but just read the diff. e.g. there is sometimes StringIO at the very end
284 2010-07-17T16:13:29 <valeuf> ah let me check
285 2010-07-17T16:13:33 <ThomasWaldmann> and sometimes you use cStringIO (which can be problematic in case you use unicode)
286 2010-07-17T16:13:50 <valeuf> (I saw that you import StringIO just you use it, but it was maybe a bad example)
287 2010-07-17T16:18:59 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8742:d7e4287ccd9f 2.0-dev-docbook-html-vjaniaut/MoinMoin/items/__init__.py: Remove useless supported mimetype for Text items
288 2010-07-17T16:19:01 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8743:c620494294f9 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_docbook_in.py: Reorder import for the DocBook_IN converter tests
289 2010-07-17T16:21:28 *** valeuf
290 2010-07-17T16:22:26 *** valeuf
291 2010-07-17T16:34:27 <ThomasWaldmann> import order is still wrong
292 2010-07-17T16:34:31 <ThomasWaldmann> valeuf:
293 2010-07-17T16:35:22 <ThomasWaldmann> can you globally and completely fix this please?
294 2010-07-17T16:35:54 <ThomasWaldmann> http://paste.pocoo.org/show/238678/
295 2010-07-17T16:37:26 <valeuf> I am reading right now
296 2010-07-17T16:37:39 <ThomasWaldmann> (globally == in all YOUR files)
297 2010-07-17T16:38:11 <ThomasWaldmann> py.test is not stdlib
298 2010-07-17T16:38:38 <ThomasWaldmann> StringIO is stdlib
299 2010-07-17T16:38:57 <ThomasWaldmann> emeraldtree is a support lib, not moin stuff
300 2010-07-17T16:42:09 *** DmitryAndreev
301 2010-07-17T16:55:29 <valeuf> py.test is support libs ?
302 2010-07-17T17:00:54 <ThomasWaldmann> it is not python stdlib
303 2010-07-17T17:01:25 <ThomasWaldmann> (we don't bundle it, but it is a support lib)
304 2010-07-17T17:01:27 <ThomasWaldmann> bbl
305 2010-07-17T17:12:14 <valeuf> ok I will read again the diff of the merge between my code and the repos to check if everything is fine
306 2010-07-17T17:12:23 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8744:02a4ec666024 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/html_in.py: Reorder import for the HTML_IN converter
307 2010-07-17T17:12:25 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8745:44bfab529ff2 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/docbook_in.py: Reorder import for the DocBook_IN converter
308 2010-07-17T17:12:27 <valeuf> I think there is still some mistake
309 2010-07-17T17:12:29 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8746:a4b3580f54d5 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_html_in.py: Reorder the imports for the HTML_IN tests
310 2010-07-17T17:12:29 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8747:67eb0a944d26 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_html_in_out.py: Reorder imports for HTML_IN_OUT tests
311 2010-07-17T17:12:30 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8748:5a53dcbad011 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_docbook_in.py: Reorder imports for DocBook_IN tests
312 2010-07-17T17:12:32 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8749:2625452a9fc3 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_docbook_out.py: Reorder imports for DocBook_OUT tests
313 2010-07-17T17:12:33 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8750:b5956d512d3f 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_docbook_out.py: Get rid of cStringIO for the DocBook_OUT converter
314 2010-07-17T17:14:37 <xorAxAx> valeuf: sigh, those import reorderings should have been 1 checkin
315 2010-07-17T17:15:10 <valeuf> xorAxAx: I thought it would be better to do one commit per file
316 2010-07-17T17:15:11 <valeuf> sorry
317 2010-07-17T19:00:43 <CIA-98> Valentin Janiaut <valentin.janiaut@utbm.fr> default * 8751:4019dd9ceaee 2.0-dev-docbook-html-vjaniaut/MoinMoin/converter2/_tests/test_html_out.py: Reorder commit for HTML_OUT tests
318 2010-07-17T19:03:48 <valeuf> weird, I cannot pull to the main moin2.0 repos this change to get a correct diff
319 2010-07-17T19:09:06 <xorAxAx> "pull to"? is that like "to push from"?
320 2010-07-17T19:10:39 <valeuf> xorAxAx: to get my diff, isn't I should pull my repo on the main moin2.0-dev repo ?
321 2010-07-17T19:23:47 <xorAxAx> that sentence doesnt make any sense :)
322 2010-07-17T19:23:51 * xorAxAx -> theatre
323 2010-07-17T19:25:44 <valeuf> hum actually what I am doing his : hg clone dev/moin2.0
324 2010-07-17T19:25:49 <valeuf> then hg pull myRepos
325 2010-07-17T19:25:51 <valeuf> then hg diff
326 2010-07-17T19:25:58 <valeuf> is there something wrong with that ?
327 2010-07-17T19:32:45 <valeuf> http://paste.pocoo.org/show/238746/ --> My last diff, I hope that everything is fine
328 2010-07-17T19:33:01 <valeuf> However, I will try to read again the converters source code once more tonight
329 2010-07-17T19:34:10 <ThomasWaldmann> valeuf: finished for now?
330 2010-07-17T19:36:25 <valeuf> ThomasWaldmann: well, I am always afraid that you can find othe bad things
331 2010-07-17T19:36:51 <valeuf> ThomasWaldmann: but I think I fixed the order of the import for the files, I also remove the docbook mimetype in the Text item
332 2010-07-17T19:37:47 <valeuf> I will get dinner, if you see any problem, just tell me on IRC, and I try to fix it during the evening
333 2010-07-17T19:48:37 * ThomasWaldmann always finds something, even in own src :P
334 2010-07-17T19:53:33 *** valeuf
335 2010-07-17T19:54:54 *** valeuf
336 2010-07-17T19:56:49 <ThomasWaldmann> valeuf: http://hg.moinmo.in/moin/2.0-dev < merged! :)
337 2010-07-17T20:43:37 *** kursor
338 2010-07-17T21:04:40 <ronny_> sup
339 2010-07-17T21:50:55 <valeuf> ThomasWaldmann: \o/ I think it is the happiest fact for this mid-term ^ ^
340 2010-07-17T21:51:11 <valeuf> TheSheep: did you forget something from your home at the EuroPython ?
341 2010-07-17T21:51:48 <xorAxAx> valeuf: now your code will live eternally
342 2010-07-17T21:54:13 <valeuf> xorAxAx: ^__^ and I aim to continue to deliver more code!
343 2010-07-17T21:54:26 <xorAxAx> i hope so! :-)
344 2010-07-17T21:54:37 <valeuf> but currently I am trying to pack my stuff for Birmingham
345 2010-07-17T21:55:00 <valeuf> and since I have only the right to bring a small hand luggage, I need to choose well what I am going te bring !
346 2010-07-17T21:55:10 <valeuf> s/bring !/bring!/
347 2010-07-17T21:59:25 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8733:5facb35112ae 2.0-dev-jinja2-plugins-dfeher/MoinMoin/templates/layout.html: [templating] added hr in footer without editbar
348 2010-07-17T21:59:26 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8734:41013706b1d1 2.0-dev-jinja2-plugins-dfeher/MoinMoin/ (templates/layout.html theme/__init__.py): [templating] fixing urls in user links and escaping properly
349 2010-07-17T21:59:38 <diofeher> brb
350 2010-07-17T22:13:23 <dreimark> re
351 2010-07-17T22:15:52 <diofeher> re
352 2010-07-17T23:08:53 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8735:e860206901b0 2.0-dev-jinja2-plugins-dfeher/MoinMoin/templates/show.html: [templating] fix rendering of pageinfo (put a blank) between item_name and info
353 2010-07-17T23:09:00 <CIA-98> Diogenes Augusto Fernandes Herminio <diofeher@gmail.com> default * 8736:866361d28de2 2.0-dev-jinja2-plugins-dfeher/MoinMoin/templates/ (editbar.html layout.html actions_menu.html): [templating] removed actions_menu.html and put it on editbar.html
354 2010-07-17T23:54:55 <ThomasWaldmann> re
355 2010-07-17T23:59:47 <ThomasWaldmann> ah, progress! :)
