Merge pull request #48 from cdeil/no_2to3

Get rid of 2to3

.gitignore

@@ -43,7 +43,9 @@ htmlcov
 .*.swp
 *~
 .tox
-
+.settings
+.project
+.pydevproject
 
 # Mac OSX
 .DS_Store

ccdproc/ccddata.py

@@ -124,7 +124,7 @@ def meta(self, value):
         else:
             h = fits.Header()
             try:
-                for k, v in value.iteritems():
+                for k, v in value.items():
                     h[k] = v
             except (ValueError, AttributeError):
                 raise TypeError('NDData meta attribute must be dict-like')
@@ -265,7 +265,7 @@ def fits_ccddata_reader(filename, hdu=0, unit=None, **kwd):
                                     'ccdproc operations.'),
         'scale_back': 'Scale information is not preserved.'
     }
-    for key, msg in unsupport_open_keywords.iteritems():
+    for key, msg in unsupport_open_keywords.items():
         if key in kwd:
             prefix = 'Unsupported keyword: {0}.'.format(key)
             raise TypeError(' '.join([prefix, msg]))

ccdproc/ccdproc.py

@@ -5,7 +5,7 @@
 import numbers
 
 import numpy as np
-
+from astropy.extern import six
 from astropy.units.quantity import Quantity
 from astropy import units as u
 from astropy.modeling import fitting
@@ -172,7 +172,7 @@ def subtract_overscan(ccd, overscan=None, fits_section=None,
     if (overscan is not None) and (not isinstance(overscan, CCDData)):
         raise TypeError('overscan is not a CCDData object')
 
-    if (fits_section is not None) and not isinstance(fits_section, basestring):
+    if (fits_section is not None) and not isinstance(fits_section, six.string_types):
         raise TypeError('overscan is not a string')
 
     if fits_section is not None:
@@ -251,7 +251,7 @@ def trim_image(ccd, fits_section=None):
     In this case, `not_really_trimmed` is a view of the underlying array
     `arr1`, not a copy.
     """
-    if fits_section is not None and not isinstance(fits_section, basestring):
+    if fits_section is not None and not isinstance(fits_section, six.string_types):
         raise TypeError("fits_section must be a string.")
     trimmed = ccd.copy()
     if fits_section:
@@ -742,7 +742,7 @@ def value(self, value):
         elif isinstance(value, Quantity):
             self._unit = value.unit
             self._value = value
-        elif isinstance(value, basestring):
+        elif isinstance(value, six.string_types):
             if self.unit is not None:
                 raise ValueError("Keyword with a unit cannot have a "
                                  "string value.")

ccdproc/log_meta.py

@@ -4,7 +4,6 @@
 from functools import wraps
 import inspect
 
-#from decorator import decorator
 from astropy.extern import six
 
 import ccdproc.ccdproc  # really only need Keyword from ccdproc
@@ -46,7 +45,7 @@ def wrapper(*args, **kwd):
 
 
 def _insert_in_metadata(metadata, arg):
-    if isinstance(arg, basestring):
+    if isinstance(arg, six.string_types):
         # add the key, no value
         metadata[arg] = None
     elif isinstance(arg, ccdproc.ccdproc.Keyword):

ccdproc/tests/test_keyword.py

@@ -1,3 +1,4 @@
+from astropy.extern import six
 from astropy.tests.helper import pytest
 from astropy import units as u
 from astropy.units import Quantity
@@ -50,7 +51,7 @@ def test_value_setting(value, unit, expected):
             key = Keyword(name, unit=unit, value=value)
     else:
         key = Keyword(name, unit=unit, value=value)
-        if isinstance(expected, basestring):
+        if isinstance(expected, six.string_types):
             assert key.value == expected
         else:
             assert key.value == numerical_value * key.unit

setup.py

@@ -112,6 +112,6 @@
       long_description=LONG_DESCRIPTION,
       cmdclass=cmdclassd,
       zip_safe=False,
-      use_2to3=True,
+      use_2to3=False,
       **package_info
       )