Merge branch 'master' into modernize-Python-2-codes

diff --cc dedrm_src/__init__.py
Simple merge

diff --cc dedrm_src/config.py
Simple merge

diff --cc dedrm_src/epubtest.py
Simple merge

diff --cc dedrm_src/genbook.py
index 9795510fd7fc09badf30a8ab76ac6606b8897ec2,3ec6ccf0e1f39390ce1cf7eeb28e0a3a081d1ff4..a7512afe9b10b62cd8cf8790a35bff0096b701c6
--- 1/dedrm_src/genbook.py
--- 2/dedrm_src/genbook.py
+++ b/dedrm_src/genbook.py
@@@ -1,7 -1,8 +1,9 @@@
  #! /usr/bin/python
  # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
  
 +from __future__ import print_function
+ from .convert2xml import encodeNumber
+ 
  class Unbuffered:
      def __init__(self, stream):
          self.stream = stream

diff --cc dedrm_src/mobidedrm.py
Simple merge

diff --cc dedrm_src/scriptinterface.py
Simple merge

diff --cc dedrm_src/wineutils.py
Simple merge