Merge pull request #1084 from Unidata/issue1083

potential fix for issue #1083

Author: Jeff Whitaker

Changelog

@@ -9,6 +9,8 @@
  * Add "fromcdl" and "tocdl" Dataset methods for import/export of CDL
    via ncdump/ncgen called externally via the subprocess module (issue #1078).
  * remove python 2.7 support.
+ * broadcast data (if possible)to conform to variable shape when writing to a slice
+   (issue #1083).
 
  version 1.5.5.1 (tag v1.5.5.1rel)
 ==================================

src/netCDF4/_netCDF4.pyx

@@ -4921,9 +4921,9 @@ cannot be safely cast to variable data type""" % attname
         # and fill with scalar values.
         if data.shape == ():
             data = numpy.tile(data,datashape)
-        # reshape data array by adding extra dimensions
-        # if needed to conform with start,count,stride.
-        if len(data.shape) != len(datashape):
+        # reshape data array if needed to conform with start,count,stride.
+        if data.ndim != len(datashape) or\
+           (data.shape != datashape and data.ndim > 1): # issue #1083
             # create a view so shape in caller is not modified (issue 90)
             try: # if extra singleton dims, just reshape
                 data = data.view()

test/tst_slicing.py

@@ -249,5 +249,18 @@ def test_issue922(self):
             assert_array_equal(f['v2'][:,1:3],np.arange(6,dtype=np.int).reshape(3,2))
             assert_array_equal(f['v2'][:,0],np.arange(3,dtype=np.int))
 
+    def test_issue1083(self):
+        with Dataset(self.file, "w") as nc:
+            nc.createDimension("test", 5)
+            v = nc.createVariable("var", "f8", ("test", "test", "test"))
+            v[:] = 1 # works
+            v[:] = np.ones(()) # works
+            v[:] = np.ones((1,)) # works
+            v[:] = np.ones((5,)) # works
+            v[:] = np.ones((5,5,5)) # works
+            v[:] = np.ones((5,1,1)) # fails (before PR #1084)
+            v[:] = np.ones((5,1,5)) # fails (before PR #1084)
+            v[:] = np.ones((5,5,1)) # fails (before PR #1084)
+
 if __name__ == '__main__':
     unittest.main()