[elbe-devel] [PATCH v2 3/3] xmlpreprocess: fix style problems

[Olivier Dion]

On Wed, 12 Feb 2020, Torben Hohn <torben.hohn at linutronix.de> 
wrote:
> pycodestyle complains: 
> 
> elbepack/xmlpreprocess.py:45:80: E501 line too long (96 > 79 
> characters) elbepack/xmlpreprocess.py:52:80: E501 line too long 
> (85 > 79 characters) elbepack/xmlpreprocess.py:54:1: E302 
> expected 2 blank lines, found 1 elbepack/xmlpreprocess.py:59:80: 
> E501 line too long (80 > 79 characters) 
> elbepack/xmlpreprocess.py:70:80: E501 line too long (85 > 79 
> characters) elbepack/xmlpreprocess.py:72:80: E501 line too long 
> (83 > 79 characters) elbepack/xmlpreprocess.py:78:1: E302 
> expected 2 blank lines, found 1 
> 
> Fix them 
> 
> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
Reviewed-by: Olivier Dion <dion at linutronix.de>
> ---
>  elbepack/xmlpreprocess.py | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/elbepack/xmlpreprocess.py b/elbepack/xmlpreprocess.py
> index acc24234e..e8c620812 100644
> --- a/elbepack/xmlpreprocess.py
> +++ b/elbepack/xmlpreprocess.py
> @@ -42,21 +42,27 @@ class XMLPreprocessError(Exception):
>  def preprocess_pgp_key(xml):
>  
>      for key in xml.iterfind('.//mirror/url-list/url/key'):
> -        print("[WARN] <key>%s</key> is deprecated.  You should use raw-key instead." % key.text)
> +        print("[WARN] <key>%s</key> is deprecated. "
> +              "You should use raw-key instead." % key.text)
>          try:
>              keyurl = key.text.strip().replace('LOCALMACHINE', 'localhost')
>              myKey = urlopen(keyurl).read().decode('ascii')
>              key.tag = "raw-key"
>              key.text = "\n%s\n" % myKey
>          except HTTPError:
> -            raise XMLPreprocessError("Invalid PGP Key URL in <key> tag: %s" % keyurl)
> +            raise XMLPreprocessError("Invalid PGP Key URL in <key> tag: %s" %
> +                                     keyurl)
> +
>  
>  def preprocess_iso_option(xml):
>  
>      src_opts = xml.find(".//src-cdrom/src-opts")
>      if src_opts is None:
>          return
> -    strict = "strict" in src_opts.attrib and src_opts.attrib["strict"] == "true"
> +
> +    strict = ("strict" in src_opts.attrib
> +              and src_opts.attrib["strict"] == "true")
> +
>      for opt in src_opts.iterfind("./*"):
>          valid = iso_option_valid(opt.tag, opt.text)
>          if valid is True:
> @@ -67,14 +73,17 @@ def preprocess_iso_option(xml):
>          if valid is False:
>              violation = "Invalid ISO option %s" % tag
>          elif isinstance(valid, int):
> -            violation = "Option %s will be truncated by %d characters" % (tag, valid)
> +            violation = ("Option %s will be truncated by %d characters" %
> +                         (tag, valid))
>          elif isinstance(valid, str):
> -            violation = ("Character '%c' (%d) in ISO option %s violated ISO-9660" %
> +            violation = ("Character '%c' (%d) in ISO option %s "
> +                         "violated ISO-9660" %
>                           (valid, ord(valid[0]), tag))
>          if strict:
>              raise XMLPreprocessError(violation)
>          print("[WARN] %s" % violation)
>  
> +
>  def preprocess_initvm_ports(xml):
>      "Filters out the default port forwardings to prevent qemu conflict"
>  
> -- 
> 2.20.1
>
>
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel
-- 
Olivier Dion
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen