Merge remote-tracking branch 'upstream/master' into zope4py2

component/gcc/buildout.cfg

@@ -57,7 +57,7 @@ environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${binutils:location}/bin:${gettext:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
-[gcc-common:os.path.isdir('/usr/lib/arm-linux-gnueabihf') and os.access('/proc/device-tree/model', os.R_OK) and 'OLinuXino-LIME2' in open('/proc/device-tree/model').read()]
+[gcc-common:os.path.isdir('/usr/lib/arm-linux-gnueabihf') and os.access('/proc/device-tree/model', os.R_OK) and 'OLinuXino' in open('/proc/device-tree/model').read()]
 extra-configure-options =
   --with-arch=armv7-a
   --with-fpu=vfp

software/proftpd/test/test.py

@@ -192,7 +192,7 @@ class TestBan(ProFTPdTestCase):
         self._getConnection(password='wrong')
 
     # after that, even with a valid password we cannot connect
-    with self.assertRaisesRegex(SSHException, 'Connection reset by peer'):
+    with self.assertRaises(Exception):
       self._getConnection()
 
     # ban event is logged