[adios] 62/207: more refresh
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 1df60d3f447def0e8761e6aeb2b270c7bf9f44a9
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Dec 9 16:04:42 2013 +0000
more refresh
---
debian/patches/python3.patch | 139 ++++++++++++++++++++++++++++++++-----------
1 file changed, 103 insertions(+), 36 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 69bf1f3..ecde8b1 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: adios-1.5.0/utils/skel/bin/skel
===================================================================
---- adios-1.5.0.orig/utils/skel/bin/skel 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/bin/skel 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/bin/skel 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -46,8 +46,8 @@ Index: adios-1.5.0/utils/skel/bin/skel
if __name__ == "__main__":
Index: adios-1.5.0/utils/skel/bin/skel_extract.py
===================================================================
---- adios-1.5.0.orig/utils/skel/bin/skel_extract.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/bin/skel_extract.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/bin/skel_extract.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel_extract.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -66,8 +66,8 @@ Index: adios-1.5.0/utils/skel/bin/skel_extract.py
#Print the header
Index: adios-1.5.0/utils/skel/lib/skelconf.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skelconf.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skelconf.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skelconf.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skelconf.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
@@ -86,17 +86,53 @@ Index: adios-1.5.0/utils/skel/lib/skelconf.py
Index: adios-1.5.0/utils/gpp/ad_config.py
===================================================================
---- adios-1.5.0.orig/utils/gpp/ad_config.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/gpp/ad_config.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/gpp/ad_config.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/gpp/ad_config.py 2013-12-09 15:59:59.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
import xml.dom.minidom
import type_mapper
+@@ -11,7 +12,7 @@
+ doc = xml.dom.minidom.parse (config_file_name)
+ nodes = doc.childNodes
+ if (nodes.length != 1):
+- print 'malformed adios config file, should contain only a single adios-config element'
++ print('malformed adios config file, should contain only a single adios-config element')
+ raise SystemExit
+ self.config_node = nodes[0]
+
+@@ -41,7 +42,7 @@
+
+ def get_buffer (self):
+ #return the buffer info
+- print 'get_buffer is not yet implemented'
++ print('get_buffer is not yet implemented')
+
+ def get_host_language (self):
+ return self.config_node.getAttribute ('host-language')
+@@ -100,7 +101,7 @@
+
+ # Returns the variable from this group with the specified name, or None
+ def get_var (self, varname):
+- if self.vardict.has_key (varname):
++ if varname in self.vardict:
+ return self.vardict [varname]
+
+ return None
+@@ -164,7 +165,7 @@
+ return None
+ else:
+ # place the dimensions in a list and remove the time-index if it is there.
+- dims = filter (lambda x : x != self.time_index, self.var_node.getAttribute ('dimensions').split(',') )
++ dims = [x for x in self.var_node.getAttribute ('dimensions').split(',') if x != self.time_index]
+ cleandims = []
+ for d in dims:
+
Index: adios-1.5.0/utils/gpp/gpp.py
===================================================================
---- adios-1.5.0.orig/utils/gpp/gpp.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/gpp/gpp.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/gpp/gpp.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/gpp/gpp.py 2013-12-09 15:57:58.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -104,10 +140,41 @@ Index: adios-1.5.0/utils/gpp/gpp.py
import sys
import os
+@@ -17,10 +17,10 @@
+ if rv == 0:
+ return 'success'
+ elif rv == 32512: # System unable to find adios_lint command
+- print "Unable to find adios_lint. Proceeding with code generation."
++ print("Unable to find adios_lint. Proceeding with code generation.")
+ return 'success'
+ else:
+- print "gpp.py failed."
++ print("gpp.py failed.")
+ return 'failure'
+
+
+@@ -235,7 +235,7 @@
+
+ # Must be called with one argument, the name of the xml file
+ if len (sys.argv) != 2:
+- print 'Usage: gpp.py <config file>\n'
++ print('Usage: gpp.py <config file>\n')
+ return 1
+
+
+@@ -256,7 +256,7 @@
+ elif lang == 'c' or lang == 'cpp':
+ generate_c (config)
+ else:
+- print "Fatal: Language unknown or unspecified"
++ print("Fatal: Language unknown or unspecified")
+ raise SystemExit
+
+
Index: adios-1.5.0/utils/skel/lib/adios.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/adios.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/adios.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/adios.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/adios.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,5 @@
+from __future__ import print_function
import xml.dom.minidom
@@ -144,8 +211,8 @@ Index: adios-1.5.0/utils/skel/lib/adios.py
Index: adios-1.5.0/utils/skel/lib/argparse.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/argparse.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/argparse.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/argparse.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/argparse.py 2013-12-09 15:47:55.000000000 +0000
@@ -81,7 +81,6 @@
'ZERO_OR_MORE',
]
@@ -156,8 +223,8 @@ Index: adios-1.5.0/utils/skel/lib/argparse.py
import re as _re
Index: adios-1.5.0/utils/skel/lib/skel_install.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_install.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_install.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_install.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_install.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -167,8 +234,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_install.py
def main(argv=None):
Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_makefile.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env python
@@ -192,8 +259,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
Index: adios-1.5.0/utils/skel/lib/skel_params.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_params.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_params.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_params.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_params.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -202,8 +269,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_params.py
import argparse
Index: adios-1.5.0/utils/skel/lib/skel_settings.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_settings.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_settings.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -233,8 +300,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_settings.py
def main(argv=None):
Index: adios-1.5.0/utils/skel/lib/skel_source.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_source.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_source.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_source.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_source.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -352,8 +419,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_source.py
for f in frees:
Index: adios-1.5.0/utils/skel/lib/skel_submit.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_submit.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_submit.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_submit.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_submit.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -363,8 +430,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_submit.py
Index: adios-1.5.0/utils/skel/lib/skel_xml.py
===================================================================
---- adios-1.5.0.orig/utils/skel/lib/skel_xml.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/utils/skel/lib/skel_xml.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_xml.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_xml.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -374,8 +441,8 @@ Index: adios-1.5.0/utils/skel/lib/skel_xml.py
Index: adios-1.5.0/wrappers/numpy/example/ncdf2bp.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/example/ncdf2bp.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -384,8 +451,8 @@ Index: adios-1.5.0/wrappers/numpy/example/ncdf2bp.py
import numpy as np
Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
@@ -403,8 +470,8 @@ Index: adios-1.5.0/wrappers/numpy/test/adios_noxml_test.py
write_int(fd, "size", size)
Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_read_test.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
@@ -421,8 +488,8 @@ Index: adios-1.5.0/wrappers/numpy/test/adios_read_test.py
f.close()
Index: adios-1.5.0/wrappers/numpy/test/adios_write_test.py
===================================================================
---- adios-1.5.0.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:26:24.000000000 +0000
-+++ adios-1.5.0/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:26:24.000000000 +0000
+--- adios-1.5.0.orig/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:47:49.000000000 +0000
++++ adios-1.5.0/wrappers/numpy/test/adios_write_test.py 2013-12-09 15:47:55.000000000 +0000
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import absolute_import, division, print_function, unicode_literals
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list