--- a/.hgtags Wed Dec 09 18:42:13 2015 +0100
+++ b/.hgtags Tue Dec 15 11:41:25 2015 +0100
@@ -508,6 +508,9 @@
c44930ac9579fe4d526b26892954e56021af18be 3.20.11
c44930ac9579fe4d526b26892954e56021af18be debian/3.20.11-1
c44930ac9579fe4d526b26892954e56021af18be centos/3.20.11-1
+03e8fc9f79a6e489a1b5c695eb0cd3fbb1afe9d4 3.20.12
+03e8fc9f79a6e489a1b5c695eb0cd3fbb1afe9d4 debian/3.20.12-1
+03e8fc9f79a6e489a1b5c695eb0cd3fbb1afe9d4 centos/3.20.12-1
887c6eef807781560adcd4ecd2dea9011f5a6681 3.21.0
887c6eef807781560adcd4ecd2dea9011f5a6681 debian/3.21.0-1
887c6eef807781560adcd4ecd2dea9011f5a6681 centos/3.21.0-1
--- a/dataimport/pgstore.py Wed Dec 09 18:42:13 2015 +0100
+++ b/dataimport/pgstore.py Tue Dec 15 11:41:25 2015 +0100
@@ -64,8 +64,9 @@
columns, encoding='utf-8'):
""" Execute thread with copy from
"""
- buf = _create_copyfrom_buffer(data, columns, encoding=encoding)
- if buf is None:
+ try:
+ buf = _create_copyfrom_buffer(data, columns, encoding=encoding)
+ except ValueError:
_execmany_thread_not_copy_from(cu, statement, data)
else:
if columns is None:
--- a/debian/changelog Wed Dec 09 18:42:13 2015 +0100
+++ b/debian/changelog Tue Dec 15 11:41:25 2015 +0100
@@ -22,6 +22,12 @@
-- Julien Cristau <julien.cristau@logilab.fr> Fri, 10 Jul 2015 17:04:11 +0200
+cubicweb (3.20.12-1) unstable; urgency=medium
+
+ * new upstream release.
+
+ -- Julien Cristau <julien.cristau@logilab.fr> Mon, 14 Dec 2015 16:28:52 +0100
+
cubicweb (3.20.11-1) unstable; urgency=medium
* New upstream release.
--- a/web/views/schema.py Wed Dec 09 18:42:13 2015 +0100
+++ b/web/views/schema.py Tue Dec 15 11:41:25 2015 +0100
@@ -657,10 +657,13 @@
}))
# svg image file
fd, tmpfile = tempfile.mkstemp('.svg')
- os.close(fd)
- generator.generate(visitor, prophdlr, tmpfile)
- with codecs.open(tmpfile, 'rb', encoding='utf-8') as svgfile:
- self.w(svgfile.read())
+ try:
+ os.close(fd)
+ generator.generate(visitor, prophdlr, tmpfile)
+ with codecs.open(tmpfile, 'rb', encoding='utf-8') as svgfile:
+ self.w(svgfile.read())
+ finally:
+ os.unlink(tmpfile)
# breadcrumbs ##################################################################