Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/nexusformat/definitions/base_classes/NXentry.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
A small image that is representative of the entry. An example of this is a 640x480
jpeg image automatically produced by a low resolution plot of the NXdata.
</doc>
<attribute name="type">
<attribute name="type" deprecated="Use the `type` field instead">
<doc>The mime type should be an ``image/*``</doc>
<enumeration>
<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<group type="NXfermi_chopper" />
<group type="NXfilter" />
<group type="NXflipper" />
<group type="NXgoniometer" />
<group type="NXguide" />
<group type="NXhistory"/>
<group type="NXinsertion_device" />
Expand Down
2 changes: 1 addition & 1 deletion src/nexusformat/nexus/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -2912,7 +2912,7 @@ def __init__(self, value=None, name='unknown', shape=None, dtype=None,
if v is not None)
if attrs is None:
attrs = {}
attrs.update(kwargs)
attrs.update({k: v for k, v in kwargs.items() if v is not None})
self._attrs = AttrDict(self, attrs=attrs)
self._memfile = None
self._uncopied_data = None
Expand Down