# HG changeset patch
# User Rémi Cardona <remi.cardona@logilab.fr>
# Date 1450185179 -3600
# Node ID 45bc791275b42d745ef5a1dd50f6998a99e74035
# Parent  b150016e476c67af2669cf1a00470837163c43e5# Parent  6528e1a0be700c4cd065fab8e44d3c15653f21ae
merge with 3.21.4

diff -r b150016e476c -r 45bc791275b4 .hgtags
--- a/.hgtags	Fri Dec 11 14:07:51 2015 +0100
+++ b/.hgtags	Tue Dec 15 14:12:59 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
@@ -520,3 +523,6 @@
 9edfe9429209848e31d1998df48da7a84db0c819 3.21.3
 9edfe9429209848e31d1998df48da7a84db0c819 debian/3.21.3-1
 9edfe9429209848e31d1998df48da7a84db0c819 centos/3.21.3-1
+d3b92d3a7db098b25168beef9b3ee7b36263a652 3.21.4
+d3b92d3a7db098b25168beef9b3ee7b36263a652 debian/3.21.4-1
+d3b92d3a7db098b25168beef9b3ee7b36263a652 centos/3.21.4-1
diff -r b150016e476c -r 45bc791275b4 __pkginfo__.py
diff -r b150016e476c -r 45bc791275b4 cubicweb.spec
--- a/cubicweb.spec	Fri Dec 11 14:07:51 2015 +0100
+++ b/cubicweb.spec	Tue Dec 15 14:12:59 2015 +0100
@@ -7,7 +7,7 @@
 %endif
 
 Name:           cubicweb
-Version:        3.21.3
+Version:        3.21.4
 Release:        logilab.1%{?dist}
 Summary:        CubicWeb is a semantic web application framework
 Source0:        http://download.logilab.org/pub/cubicweb/cubicweb-%{version}.tar.gz
diff -r b150016e476c -r 45bc791275b4 dataimport/__init__.py
diff -r b150016e476c -r 45bc791275b4 dataimport/pgstore.py
--- a/dataimport/pgstore.py	Fri Dec 11 14:07:51 2015 +0100
+++ b/dataimport/pgstore.py	Tue Dec 15 14:12:59 2015 +0100
@@ -68,8 +68,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:
diff -r b150016e476c -r 45bc791275b4 debian/changelog
--- a/debian/changelog	Fri Dec 11 14:07:51 2015 +0100
+++ b/debian/changelog	Tue Dec 15 14:12:59 2015 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.21.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Rémi Cardona <remi.cardona@logilab.fr>  Tue, 15 Dec 2015 11:59:58 +0100
+
 cubicweb (3.21.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -22,6 +28,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.
diff -r b150016e476c -r 45bc791275b4 web/views/schema.py
--- a/web/views/schema.py	Fri Dec 11 14:07:51 2015 +0100
+++ b/web/views/schema.py	Tue Dec 15 14:12:59 2015 +0100
@@ -660,10 +660,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 ##################################################################