Merge branch 'opus_2015_3dms' (fixed conflicts)1.2.3

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/stwcs/updatewcs/wfpc2_dgeo.py b/lib/stwcs/updatewcs/wfpc2_dgeo.py
index e0c01f2..e57bb5c 100644
--- a/lib/stwcs/updatewcs/wfpc2_dgeo.py
+++ b/lib/stwcs/updatewcs/wfpc2_dgeo.py
@@ -35,7 +35,7 @@ def update_wfpc2_d2geofile(filename, fhdu=None):
         image header will be updated/added to point to this newly created file.
 
     """
-
+    
     close_fhdu = False
     if fhdu is None:
         fhdu = fileutil.openImage(filename, mode='update')
diff --git a/setup.py b/setup.py
index e188253..26bc0d2 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,6 @@ except ImportError:
 setup(
     setup_requires=['d2to1>=0.2.9', 'stsci.distutils>=0.3.2'],
     d2to1=True,
-    use_2to3=True,
+    use_2to3=False,
     zip_safe=False
 )