From: Guido Draheim <guidod@gmx.de>
Date: Mon, 13 Apr 2020 11:15:42 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: v0.13.70~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d05cb6dd04375fa532c65ccf3f3d478829e663b;p=zziplib

Merge branch 'develop'
---

9d05cb6dd04375fa532c65ccf3f3d478829e663b
diff --cc .gitignore
index 70a7252,dd4ad8a..5274918
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,12 +1,11 @@@
  *~
  *.cache
- Makefile
  build
  *-linux-*
 -<<<<<<< HEAD
+ *.pyc
+ *.tmp
+ docs/man3
+ docs/html
  *.tmp
  *.pyc
  __pycache__
diff --cc docs/zzipdoc/htm2dbk.py
index 98b4f67,d0f17cc..021a22a
--- a/docs/zzipdoc/htm2dbk.py
+++ b/docs/zzipdoc/htm2dbk.py
@@@ -146,8 -146,8 +146,13 @@@ def htm2dbk_files(args)
              doc.filename = filename
              doc.add(f.read())
              f.close()
++<<<<<<< HEAD
 +        except IOError as e:
 +            print >> sys.stderr, "can not open "+filename
++=======
+         except IOError:
+             print("can not open "+filename, file=sys.stderr)
++>>>>>>> develop
      return doc.value()
  
  def html2docbook(text):