# HG changeset patch # User Samuel Trégouët # Date 1441979538 -7200 # Node ID dfa1dcf4d7f15994f595750e6b039e7f936afc49 # Parent 8e46ed1a0b8ad3d9f09138da06f762eaa69d2328 [py3k] ur'' is gone diff -r 8e46ed1a0b8a -r dfa1dcf4d7f1 dataimport/pgstore.py --- a/dataimport/pgstore.py Fri Sep 11 15:50:29 2015 +0200 +++ b/dataimport/pgstore.py Fri Sep 11 15:52:18 2015 +0200 @@ -136,7 +136,7 @@ :encoding: resulting string encoding (default: utf-8) ''' encoding = opts.get('encoding','utf-8') - escape_chars = ((u'\\', ur'\\'), (u'\t', u'\\t'), (u'\r', u'\\r'), + escape_chars = ((u'\\', u'\\\\'), (u'\t', u'\\t'), (u'\r', u'\\r'), (u'\n', u'\\n')) for char, replace in escape_chars: value = value.replace(char, replace) diff -r 8e46ed1a0b8a -r dfa1dcf4d7f1 web/test/unittest_idownloadable.py --- a/web/test/unittest_idownloadable.py Fri Sep 11 15:50:29 2015 +0200 +++ b/web/test/unittest_idownloadable.py Fri Sep 11 15:52:18 2015 +0200 @@ -91,9 +91,9 @@ def test_header_with_space_and_comma(self): with self.admin_access.web_request() as req: - self.create_user(req, login=ur'c " l\ a', password='babar') + self.create_user(req, login=u'c " l\\ a', password='babar') req.cnx.commit() - with self.new_access(ur'c " l\ a').web_request() as req: + with self.new_access(u'c " l\\ a').web_request() as req: req.form['vid'] = 'download' req.form['eid'] = str(req.user.eid) data = self.ctrl_publish(req,'view')