RF: refactoring to account for pydicom 1 changes.

See also:

* pydicom/pydicom#553
* pydicom/pydicom#554
* pydicom/pydicom#555

Author: matthew-brett

nibabel/nicom/dicomwrappers.py

@@ -21,7 +21,7 @@
 from .dwiparams import B2q, nearest_pos_semi_def, q2bg
 from ..openers import ImageOpener
 from ..onetime import setattr_on_read as one_time
-from ..pydicom_compat import pydicom
+from ..pydicom_compat import tag_for_keyword
 
 
 class WrapperError(Exception):
@@ -517,7 +517,7 @@ def image_shape(self):
         # Determine if one of the dimension indices refers to the stack id
         dim_seq = [dim.DimensionIndexPointer
                    for dim in self.get('DimensionIndexSequence')]
-        stackid_tag = pydicom.datadict.tag_for_name('StackID')
+        stackid_tag = tag_for_keyword('StackID')
         # remove the stack id axis if present
         if stackid_tag in dim_seq:
             stackid_dim_idx = dim_seq.index(stackid_tag)

nibabel/nicom/tests/test_dicomwrappers.py

@@ -9,7 +9,8 @@
 
 import numpy as np
 
-from nibabel.pydicom_compat import have_dicom, pydicom, read_file, dicom_test
+from nibabel.pydicom_compat import (have_dicom, pydicom, read_file, dicom_test,
+                                    tag_for_keyword)
 
 from .. import dicomwrappers as didw
 from .. import dicomreaders as didr
@@ -416,8 +417,8 @@ def __init__(self, div, sid):
     dim_idx_seq = [DimIdxSeqElem()] * num_of_frames
     # add an entry for StackID into the DimensionIndexSequence
     if sid_dim is not None:
-        sid_tag = pydicom.datadict.tag_for_name('StackID')
-        fcs_tag = pydicom.datadict.tag_for_name('FrameContentSequence')
+        sid_tag = tag_for_keyword('StackID')
+        fcs_tag = tag_for_keyword('FrameContentSequence')
         dim_idx_seq[sid_dim] = DimIdxSeqElem(sid_tag, fcs_tag)
     # create the PerFrameFunctionalGroupsSequence
     frames = [PerFrmFuncGrpSeqElem(div, sid)

nibabel/pydicom_compat.py

@@ -10,17 +10,18 @@
 * pydicom : pydicom module or dicom module or None of not importable;
 * read_file : ``read_file`` function if pydicom or dicom module is importable
   else None;
+* tag_for_keyword : ``tag_for_keyword`` function if pydicom or dicom module
+  is importable else None;
 * dicom_test : test decorator that skips test if dicom not available.
 """
 
-# Module does (apparently) unused imports; stop flake8 complaining
+# Module has (apparently) unused imports; stop flake8 complaining
 # flake8: noqa
 
 import numpy as np
 
 have_dicom = True
-read_file = None
-pydicom = None
+pydicom = read_file = tag_for_keyword = None
 
 try:
     import dicom as pydicom
@@ -38,6 +39,14 @@
 else:  # dicom module available
     read_file = pydicom.read_file
 
+if have_dicom:
+    try:
+        # Versions >= 1.0
+        tag_for_keyword = pydicom.datadict.tag_for_keyword
+    except AttributeError:
+        # Versions < 1.0 - also has more search options.
+        tag_for_keyword = pydicom.datadict.tag_for_name
+
 
 # test decorator that skips test if dicom not available.
 dicom_test = np.testing.dec.skipif(not have_dicom,