Merge lp:~x-christian/swatchbooker/swatchbooker into lp:swatchbooker

Proposed by Christian Burger on 2013-07-13
Status: Merged
Merged at revision: 146
Proposed branch: lp:~x-christian/swatchbooker/swatchbooker
Merge into: lp:swatchbooker
Diff against target: 15 lines (+3/-2)
1 file modified
src/swatchbook/websvc/ral.py (+3/-2)
To merge this branch: bzr merge lp:~x-christian/swatchbooker/swatchbooker
Reviewer Review Type Date Requested Status
Olivier Berten 2013-07-13 Pending
Review via email: mp+174541@code.launchpad.net

Description of the change

fixed a small problem with RAL web import due to HTML mark-up changes

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/swatchbook/websvc/ral.py'
--- src/swatchbook/websvc/ral.py 2011-01-22 15:11:41 +0000
+++ src/swatchbook/websvc/ral.py 2013-07-13 11:27:26 +0000
@@ -56,8 +56,9 @@
56 line = line.split('"')[1]56 line = line.split('"')[1]
57 line = line.replace(' <br />','')57 line = line.replace(' <br />','')
58 line = line.replace('&nbsp;',' ')58 line = line.replace('&nbsp;',' ')
59 line = line.split('><td><p>',1)[1].split('</p></td></tr>')[0]59 line = line.replace('- ', '')
60 code,de,en,fr,es,it,nl = map(strip,line.split('</p></td><td><p>'))60 line = line.split('> <td><p>',1)[1].split('</p></td> </tr>')[0]
61 code,de,en,fr,es,it,nl = map(strip,line.split('</p></td> <td><p>'))
61 item.info.identifier = unicode(code)62 item.info.identifier = unicode(code)
62 item.info.title = unicode(de,'UTF-8')63 item.info.title = unicode(de,'UTF-8')
63 item.info.title_l10n = {'de': unicode(de,'UTF-8'),'en': unicode(en,'UTF-8'),'fr': unicode(fr,'UTF-8'),'es': unicode(es,'UTF-8'),'it': unicode(it,'UTF-8'),'nl': unicode(nl,'UTF-8')}64 item.info.title_l10n = {'de': unicode(de,'UTF-8'),'en': unicode(en,'UTF-8'),'fr': unicode(fr,'UTF-8'),'es': unicode(es,'UTF-8'),'it': unicode(it,'UTF-8'),'nl': unicode(nl,'UTF-8')}

Subscribers

People subscribed via source and target branches