[py3k] ur'' is gone
authorSamuel Trégouët <samuel.tregouet@logilab.fr>
Fri, 11 Sep 2015 15:52:18 +0200
changeset 10592 dfa1dcf4d7f1
parent 10591 8e46ed1a0b8a
child 10593 03ce3d24db87
[py3k] ur'' is gone
dataimport/pgstore.py
web/test/unittest_idownloadable.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)
--- 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')