[med-svn] [Git][med-team/spades][master] 2 commits: Fix pyyaml patch

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / spades


Commits:
3b3309c0 by Andreas Tille at 2019-11-13T13:24:53Z
Fix pyyaml patch

- - - - -
639914be by Andreas Tille at 2019-11-13T13:25:13Z
Fix Python3 patch

- - - - -


2 changed files:

- debian/patches/python3.patch
- debian/patches/yaml_load.patch


Changes:

=====================================
debian/patches/python3.patch
=====================================
@@ -120,7 +120,7 @@ Description: Make sure Python3 interpreter is used in scripts
              with open(cfg_file) as infile:
                  for line in infile:
 -                    for src, target in replacements.iteritems():
-+                    for src, target in list(replacements.iteritems()):
++                    for src, target in replacements.items():
                          line = line.replace(src, target)
                      lines.append(line)
              with open(cfg_file, 'w') as outfile:
@@ -129,7 +129,7 @@ Description: Make sure Python3 interpreter is used in scripts
              with open(cfg_file) as infile:
                  for line in infile:
 -                    for src, target in replacements.iteritems():
-+                    for src, target in list(replacements.iteritems()):
++                    for src, target in replacements.items():
                          line = line.replace(src, target)
                      lines.append(line)
              with open(cfg_file, 'w') as outfile:


=====================================
debian/patches/yaml_load.patch
=====================================
@@ -10,7 +10,7 @@ Description: Specify yaml loader
  
          log.info("  Reads:")
 -        dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'))
-+        dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'), Loader=yaml.FullLoader)
++        dataset_data = pyyaml.load(open(cfg["dataset"].yaml_filename, 'r'), Loader=pyyaml.FullLoader)
          dataset_data = support.relative2abs_paths(dataset_data, os.path.dirname(cfg["dataset"].yaml_filename))
          support.pretty_print_reads(dataset_data, log)
  



View it on GitLab: https://salsa.debian.org/med-team/spades/compare/9207cab94da2e59b88cc9a282b48efa7b0233e84...639914be81dc5d563998c58ee9c98d64640d6369

-- 
View it on GitLab: https://salsa.debian.org/med-team/spades/compare/9207cab94da2e59b88cc9a282b48efa7b0233e84...639914be81dc5d563998c58ee9c98d64640d6369
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191113/f4caa66b/attachment.html>