From 53411db5dc2cff2131b906074a068e7c9e7f62ea Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 01 May 2021 03:51:36 +0000
Subject: [PATCH] Fixed syntax problem with the convert
---
aaxConvert.py | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 9224f6f..d6045f0 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -u
+#!/usr/bin/env -S python -u
import argparse
import os
import glob
@@ -60,7 +60,7 @@
def getmetacopyright():
# Return normalized copyright data
copyright = unicodedata.normalize('NFKD', metadata['format']['tags']['copyright']).encode('ascii','ignore')
- return copyright
+ return copyright.decode()
def getmetadatatags(key):
# get specific data
@@ -79,17 +79,17 @@
getmetacopyright(),outpath)
if args.verbose:
print(command)
- process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
- while True:
- output = process.stdout.readline()
- if output == '' and process.poll() is not None:
- break
- if output:
- print(output.strip())
- rc = process.poll()
+ process = subprocess.run(command, shell=True, capture_output=True)
+ # while True:
+ # output = process.stdout.readline()
+ # if output == '' and process.poll() is not None:
+ # break
+ # if output:
+ # print(output.strip())
+ rc = process.stdout
return rc
else:
- process = subprocess.call(shlex.split(command))
+ process = subprocess.run(command, shell=True)
return
@@ -114,17 +114,17 @@
chapter, outfile)
if args.verbose:
print(command)
- process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
- while True:
- output = process.stdout.readline()
- if output == '' and process.poll() is not None:
- break
- if output:
- print(output.strip())
+ process = subprocess.run(command, shell=True, capture_output=True)
+ # while True:
+ # output = process.stdout.readline()
+ # if output == '' and process.poll() is not None:
+ # break
+ # if output:
+ # print(output.strip())
rc = process.poll()
return rc
else:
- process = subprocess.call(shlex.split(command))
+ process = subprocess.run(command, shell=True)
return
@@ -134,7 +134,7 @@
path, outpath)
if args.verbose:
print(command)
- process = subprocess.call(shlex.split(command))
+ process = process = subprocess.run(command, shell=True)
return
# def filechecksum(aaxfile):
@@ -150,7 +150,7 @@
#request the key for the checksum
try:
r = requests.post('http://prod-faas-gw.darkurthe.net:8080/function/checkkey', metadata['checksum'], verify=False, timeout=None)
- return r.text
+ return r.text.strip()
except requests.exceptions.HTTPError as err:
raise error
return None
--
Gitblit v1.10.0