Fix BytesIO import (again), py3.3 compat

Author: kastman

nibabel/nifti1.py

@@ -434,7 +434,7 @@ def get_sizeondisk(self):
     from dicom.filewriter import write_dataset
     from dicom.filebase import DicomFileLike
     from dicom.values import converters as dicom_converters
-    from six import BytesIO
+    from io import BytesIO
 except ImportError:
     """Fall back to standard reader if pydicom unavailable."""
     Nifti1DicomExtension = Nifti1Extension

nibabel/tests/test_nifti1.py

@@ -1088,17 +1088,15 @@ def test_nifti_dicom_extension():
 
     # create a single dicom tag (Patien ID, [0010,0020]) with Explicit VR
     dcmbytes = struct.pack('<HH2sH4s',0x10,0x20,
-        u'LO'.encode('utf-8'),
-        4,
-        u'NiPy'.encode('utf-8'))
+        'LO'.encode('utf-8'),4,'NiPy'.encode('utf-8'))
     dcmext = Nifti1DicomExtension(2,dcmbytes)
     assert_equal(dcmext.__class__, Nifti1DicomExtension)
     assert_equal(dcmext.get_content().PatientID, 'NiPy')
     assert_equal(len(dcmext.get_content().values()), 1)
 
     # create a single dicom tag (Patien ID, [0010,0020]) with Implicit VR
     dcmext = Nifti1DicomExtension(2,
-        struct.pack('<HHL4s',0x10,0x20,4,u'NiPy'.encode('utf-8')))
+        struct.pack('<HHL4s',0x10,0x20,4,'NiPy'.encode('utf-8')))
     assert_equal(dcmext.get_content().PatientID, 'NiPy')
     assert_equal(len(dcmext.get_content().values()), 1)