Changeset f3bf622 in sasview for setup.py

Timestamp:

Apr 6, 2017 8:15:08 PM (7 years ago)

Author:

andyfaff

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6435594

Parents:

ec8886e

Message:

MAINT: remove has_key occurences

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -53 +53 @@
     #             os.remove(file_path)
     if os.path.exists(SASVIEW_BUILD):
-        print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
+        print("Removing existing build directory", SASVIEW_BUILD, "for a clean build")
         shutil.rmtree(SASVIEW_BUILD)
 
@@ -74 +74 @@
                 enable_openmp = False
         except:
-            print "PROBLEM determining Darwin version"
+            print("PROBLEM determining Darwin version")
 
 # Options to enable OpenMP
@@ -95 +95 @@
             platform_copt = {'unix' : ['-Wno-error=unused-command-line-argument-hard-error-in-future']}
     except:
-        print "PROBLEM determining Darwin version"
+        print("PROBLEM determining Darwin version")
 
 class DisableOpenMPCommand(Command):
@@ -118 +118 @@
         # Get 64-bitness
         c = self.compiler.compiler_type
-        print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
+        print("Compiling with %s (64bit=%s)" % (c, str(is_64bits)))
 
         # OpenMP build options
         if enable_openmp:
-            if copt.has_key(c):
+            if c in copt:
                 for e in self.extensions:
                     e.extra_compile_args = copt[ c ]
-            if lopt.has_key(c):
+            if c in lopt:
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]
 
         # Platform-specific build options
-        if platform_lopt.has_key(c):
+        if c in platform_lopt:
             for e in self.extensions:
                 e.extra_link_args = platform_lopt[ c ]
 
-        if platform_copt.has_key(c):
+        if c in platform_copt:
             for e in self.extensions:
                 e.extra_compile_args = platform_copt[ c ]