# HG changeset patch
# User Philippe Pepiot <philippe.pepiot@logilab.fr>
# Date 1531914780 -7200
# Node ID 1b3d82915321de1f5957c42f604193000441f7e2
# Parent  921dfb88b115e9a2b66709928ab87e3def732dcd# Parent  34c7c656022f7cfe876d98853769a9a5a75fd63a
Merge 3.26

diff -r 921dfb88b115 -r 1b3d82915321 .hgtags
--- a/.hgtags	Wed Jul 11 09:18:57 2018 +0200
+++ b/.hgtags	Wed Jul 18 13:53:00 2018 +0200
@@ -627,3 +627,6 @@
 f7067be5f69cd05f34ce99fbb534e4674b3a782d debian/3.26.3-1
 e1c1af68db86356e7893d7f808dcb76c87623b18 3.26.4
 e1c1af68db86356e7893d7f808dcb76c87623b18 debian/3.26.4-1
+76d7b0aa94d2ac2e4b431949f20fe1fc51b1a6b1 3.26.5
+8362503a92482e74a674c78fe009cf6ff346c817 3.26.6
+8362503a92482e74a674c78fe009cf6ff346c817 debian/3.26.6-1
diff -r 921dfb88b115 -r 1b3d82915321 cubicweb/__pkginfo__.py
diff -r 921dfb88b115 -r 1b3d82915321 cubicweb/_exceptions.py
--- a/cubicweb/_exceptions.py	Wed Jul 11 09:18:57 2018 +0200
+++ b/cubicweb/_exceptions.py	Wed Jul 18 13:53:00 2018 +0200
@@ -98,7 +98,7 @@
     def rtypes(self):
         if 'rtypes' in self.kwargs:
             return self.kwargs['rtypes']
-        cstrname = unicode(self.kwargs['cstrname'])
+        cstrname = text_type(self.kwargs['cstrname'])
         cstr = self.session.find('CWUniqueTogetherConstraint', name=cstrname).one()
         return sorted(rtype.name for rtype in cstr.relations)
 
diff -r 921dfb88b115 -r 1b3d82915321 debian/changelog
--- a/debian/changelog	Wed Jul 11 09:18:57 2018 +0200
+++ b/debian/changelog	Wed Jul 18 13:53:00 2018 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.26.6-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Philippe Pepiot <philippe.pepiot@logilab.fr>  Wed, 18 Jul 2018 13:46:36 +0200
+
 cubicweb (3.26.4-1) unstable; urgency=medium
 
   * New upstream release.