python-postgres
diff --git a/‎postgresql/documentation/changes.txt‎
Lines changed: 2 additions & 1 deletion b/‎postgresql/documentation/changes.txt‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎postgresql/driver/pq3.py‎
Lines changed: 1 addition & 1 deletion b/‎postgresql/driver/pq3.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎postgresql/test/test_driver.py‎
Lines changed: 12 additions & 0 deletions b/‎postgresql/test/test_driver.py‎
Lines changed: 12 additions & 0 deletions
@@ -4,7 +4,8 @@ Changes
 1.0.1 in development
 --------------------
 
- * First .first()'s handling of counts and commands.
+ * Fix unpacking of array NULLs. (Elvis Pranskevichus)
+ * Fix .first()'s handling of counts and commands.
    Bad logic caused zero-counts to return the command tag.
  * Don't interrupt and close a temporal connection if it's not open.
  * Use the Driver's typio attribute for TypeIO overrides. (Elvis Pranskevichus)
 
@@ -349,7 +349,7 @@ def pack_an_array(data, get_parts = self.array_parts):
 		if hasbin_output:
 			def unpack_an_array(data, array_from_parts = self.array_from_parts):
 				flags, typoid, dims, lbs, elements = array_unpack(data)
-				return array_from_parts((map(unpack_element, elements), dims, lbs))
+				return array_from_parts(((x if x is None else unpack_element(x) for x in elements), dims, lbs))
 		else:
 			# signals string formatting
 			unpack_an_array = None
 
@@ -1753,5 +1753,17 @@ def testIdentify(self):
 		# It just exercises the code path.
 		db.typio.identify(contrib_hstore = 'pg_catalog.reltime')
 
+	@pg_tmp
+	def testArrayNulls(self):
+		try:
+			sqlexec('SELECT ARRAY[1,NULL]::int[]')
+		except Exception:
+			# unsupported here
+			return
+		inta = prepare('select $1::int[]').first
+		texta = prepare('select $1::text[]').first
+		self.failUnlessEqual(inta([1,2,None]), [1,2,None])
+		self.failUnlessEqual(texta(["foo",None,"bar"]), ["foo",None,"bar"])
+
 if __name__ == '__main__':
 	unittest.main()