Adjuste code so that it compiles on all Python versions

Jürgen Knödlseder
1 parent bec1b15e
Showing 5 changed files with 7 additions and 7 deletions
cscripts/Makefile.am
cscripts/cstsmapsplit.py
doc/source/users/tutorials/1dc/howto_tsmap.rst
pyext/setup.py.in
test/Makefile.am
@@ -241,7 +241,7 @@ uninstall-hook:
  
 # Files to be removed in build directory
 clean-local:
-	@if test '@srcdir@' != '@builddir@'; then \
+	@if test '@top_srcdir@' != '@top_builddir@'; then \
 		rm -rf $(top_builddir)/cscripts/cs*.py; \
 		rm -rf $(top_builddir)/cscripts/obsutils.py; \
 		rm -rf $(top_builddir)/cscripts/modutils.py; \
@@ -286,9 +286,7 @@ class cstsmapsplit(ctools.cscript):
         f.close()
  
         # Make file executable
-        mode  = os.stat(filename).st_mode
-        mode |= (mode & 0o444) >> 2    # copy R bits to X
-        os.chmod(filename, mode)
+        os.system('chmod +x %s' % filename)
  
         # Return
         return
@@ -77,7 +77,7 @@ The figure below shows the resulting Test Statistic map.
       Size of the Y axis in pixels [200] 10
       Test source name [Crab] Src001
       Output Test Statistic map file [tsmap.fits] tsmap_split.fits
-      Number of TS map bins per task [5]
+      Number of TS map bins per task [5] 10
       Compute null hypothesis first? [yes]
       ASCII file containing all commands [commands.dat] tsmap_commands.dat
  
@@ -141,8 +141,8 @@ if is_build:
     if '@BUILD_WRAPPERS_FALSE@' != '#':
         py_file  = pkg_name+'/tools.py'
         cpp_file = pkg_name+'/tools_wrap.cpp'
-        os.system('cp %s %s' % ('@srcdir@/'+cpp_file, '@builddir@/'+cpp_file))
-        os.system('cp %s %s' % ('@srcdir@/'+py_file,  '@builddir@/'+py_file))
+        os.system('cp %s %s' % ('@top_srcdir@/pyext/'+cpp_file, '@top_builddir@/pyext/'+cpp_file))
+        os.system('cp %s %s' % ('@top_srcdir@/pyext/'+py_file,  '@top_builddir@/pyext/'+py_file))
  
     # In case that the build directory is different from the source directory
     # then copy all cscripts and parfiles from the source directory to the
@@ -49,6 +49,8 @@ all-local:
  
 # Files to be removed in build directory
 clean-local:
+	rm -rf $(top_builddir)/test/*.pyc
+	rm -rf $(top_builddir)/test/__pycache__
 	rm -rf $(top_builddir)/test/*.fits
 	rm -rf $(top_builddir)/test/*.log
 	rm -rf $(top_builddir)/test/*.xml