From 8501eb89584b2ad51d3a8e21c8235a81ce01b871 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>

Date: Tue, 26 Jun 2018 19:12:18 +0200

Subject: [PATCH 1/4] Make dblatex compatible with Python 3

---

 lib/dbtexmf/core/commander.py             |  3 +-

 lib/dbtexmf/core/confparser.py            | 18 +++--

 lib/dbtexmf/core/dbtex.py                 | 99 ++++++++++++++---------

 lib/dbtexmf/core/error.py                 |  4 +-

 lib/dbtexmf/core/imagedata.py             | 28 ++++---

 lib/dbtexmf/core/sgmlxml.py               | 11 +--

 lib/dbtexmf/core/txtparser.py             |  5 +-

 lib/dbtexmf/core/xmlparser.py             |  2 +-

 lib/dbtexmf/dblatex/dblatex.py            |  4 +-

 lib/dbtexmf/dblatex/grubber/bibtex.py     | 21 ++---

 lib/dbtexmf/dblatex/grubber/bibtopic.py   |  4 +-

 lib/dbtexmf/dblatex/grubber/dvips.py      |  6 +-

 lib/dbtexmf/dblatex/grubber/index.py      | 35 ++++----

 lib/dbtexmf/dblatex/grubber/latex.py      | 15 ++--

 lib/dbtexmf/dblatex/grubber/logparser.py  |  7 +-

 lib/dbtexmf/dblatex/grubber/makeidx.py    |  2 +-

 lib/dbtexmf/dblatex/grubber/maker.py      |  5 +-

 lib/dbtexmf/dblatex/grubber/msg.py        | 23 +++---

 lib/dbtexmf/dblatex/grubber/pdftex.py     |  7 +-

 lib/dbtexmf/dblatex/grubber/plugins.py    | 16 ++--

 lib/dbtexmf/dblatex/grubber/ps2pdf.py     |  6 +-

 lib/dbtexmf/dblatex/grubber/texbuilder.py |  8 +-

 lib/dbtexmf/dblatex/grubber/util.py       |  6 +-

 lib/dbtexmf/dblatex/grubber/xetex.py      |  2 +-

 lib/dbtexmf/dblatex/grubber/xr-hyper.py   |  8 +-

 lib/dbtexmf/dblatex/rawparse.py           | 12 +--

 lib/dbtexmf/dblatex/rawtex.py             | 21 ++---

 lib/dbtexmf/dblatex/rawverb.py            | 50 ++++++------

 lib/dbtexmf/dblatex/runtex.py             | 13 +--

 lib/dbtexmf/dblatex/texcodec.py           | 47 ++++++-----

 lib/dbtexmf/dblatex/texhyphen.py          | 22 ++---

 lib/dbtexmf/dblatex/xetex/codec.py        |  2 +-

 lib/dbtexmf/dblatex/xetex/fcfallback.py   | 10 ++-

 lib/dbtexmf/dblatex/xetex/fcmanager.py    |  3 +

 lib/dbtexmf/dblatex/xetex/fontspec.py     |  4 +-

 lib/dbtexmf/dblatex/xetex/fsconfig.py     |  4 +-

 lib/dbtexmf/dblatex/xetex/fsencoder.py    |  8 +-

 lib/dbtexmf/xslt/4xslt.py                 |  3 +-

 lib/dbtexmf/xslt/xsltproc.py              |  3 +

 setup.py                                  | 53 ++++++------

 40 files changed, 337 insertions(+), 263 deletions(-)

diff --git a/lib/dbtexmf/core/commander.py b/lib/dbtexmf/core/commander.py

index 6319200..5efa074 100644

--- a/lib/dbtexmf/core/commander.py

+++ b/lib/dbtexmf/core/commander.py

@@ -1,5 +1,6 @@

 import os

 from subprocess import Popen, PIPE

+from io import open

 class Command:

     """Contains the needed data to run a command"""

@@ -59,7 +60,7 @@ class CommandRunner:

             if cmd.stdout == "PIPE":

                 stdout = PIPE

             elif cmd.stdout:

-                stdout = open(cmd.stdout % kw, "w")

+                stdout = open(cmd.stdout % kw, "wb")

             if kw: args = [a % kw for a in cmd.arguments]

             else: args = cmd.arguments

diff --git a/lib/dbtexmf/core/confparser.py b/lib/dbtexmf/core/confparser.py

index bf0b931..fc01786 100644

--- a/lib/dbtexmf/core/confparser.py

+++ b/lib/dbtexmf/core/confparser.py

@@ -1,11 +1,13 @@

+from __future__ import print_function

+

 import os

 import sys

 from xml.etree.ElementTree import ParseError

-from xmlparser import XmlConfig

-from txtparser import TextConfig

-from imagedata import ImageConverterPool, ImageConverter

-from imagedata import ImageFormatPool, FormatRule

-from imagedata import image_setup

+from dbtexmf.core.xmlparser import XmlConfig

+from dbtexmf.core.txtparser import TextConfig

+from dbtexmf.core.imagedata import ImageConverterPool, ImageConverter

+from dbtexmf.core.imagedata import ImageFormatPool, FormatRule

+from dbtexmf.core.imagedata import image_setup

 from dbtexmf.xslt.xsltconf import XsltCommandPool, XsltEngine

 from dbtexmf.xslt import xslt_setup

@@ -76,16 +78,16 @@ class DbtexConfig:

         self.style_exts = ["", ".xml", ".specs", ".conf"]

     def warn(self, text):

-        print >>sys.stderr, text

+        print(text, file=sys.stderr)

     def fromfile(self, filename):

         try:

             self.fromxmlfile(filename)

-        except ParseError, e:

+        except ParseError as e:

             self.warn("Text configuration files are deprecated. "\

                       "Use the XML format instead")

             self.fromtxtfile(filename)

-        except Exception, e:

+        except Exception as e:

             raise e

     def fromxmlfile(self, filename):

diff --git a/lib/dbtexmf/core/dbtex.py b/lib/dbtexmf/core/dbtex.py

index 92b84f2..b12fafe 100644

--- a/lib/dbtexmf/core/dbtex.py

+++ b/lib/dbtexmf/core/dbtex.py

@@ -2,16 +2,18 @@

 # DbTex base class handling the compilation of a DocBook file via

 # XSL Transformation and some TeX engine compilation.

 #

+from __future__ import print_function

+

 import sys

 import os

 import re

 import shlex

 import tempfile

 import shutil

-import urllib

 import glob

 import imp

 from optparse import OptionParser

+from io import open

 from dbtexmf.core.txtparser import texinputs_parse, texstyle_parse

 from dbtexmf.core.confparser import DbtexConfig

@@ -19,6 +21,11 @@ from dbtexmf.xslt import xslt

 import dbtexmf.core.logger as logger

 from dbtexmf.core.error import signal_error, failed_exit, dump_stack

+try:

+    from urllib import pathname2url

+except ImportError:

+    from urllib.request import pathname2url

+

 def suffix_replace(path, oldext, newext=""):

     (root, ext) = os.path.splitext(path)

@@ -29,9 +36,9 @@ def suffix_replace(path, oldext, newext=""):

 def path_to_uri(path):

     if os.name == 'nt':

-        return 'file:' + urllib.pathname2url(path).replace('|', ':', 1)

+        return 'file:' + pathname2url(path).replace('|', ':', 1)

     else:

-        return urllib.pathname2url(path)

+        return pathname2url(path)

 class Document:

@@ -48,24 +55,36 @@ class Document:

     def has_subext(self, ext):

         return (os.path.splitext(self.basename)[1] == ext)

-    def __cmp__(self, other):

-        """

-        Comparaison method mainly to check if the document is in a list

-        """

-        if cmp(self.rawfile, other) == 0:

-            return 0

-        if cmp(self.texfile, other) == 0:

-            return 0

-        if cmp(self.binfile, other) == 0:

-            return 0

-        return -1

+    def __eq__(self, other):

+        if self.rawfile == other:

+            return True

+        if self.texfile == other:

+            return True

+        if self.binfile == other:

+            return True

+        return False

+

+    def __ne__(self, other):

+        return not self.__eq__(other)

+

+    def __lt__(self, other):

+        return self.__ne__(other)

+

+    def __le__(self, other):

+        return False

+

+    def __gt__(self, other):

+        return False

+

+    def __ge__(self, other):

+        return False

 class DbTex:

     USE_MKLISTINGS = 1

     xsl_header = \

-"""

+u"""

                 xmlns:m="http://www.w3.org/1998/Math/MathML"

                 version="1.0">

@@ -183,7 +202,7 @@ class DbTex:

         self.flags &= ~what

     def get_version(self):

-        f = file(os.path.join(self.topdir, "xsl", "version.xsl"))

+        f = open(os.path.join(self.topdir, "xsl", "version.xsl"), "rt", encoding="latin-1")

         versions = re.findall("<xsl:variable[^>]*>([^<]*)<", f.read())

         f.close()

         if versions:

@@ -196,11 +215,11 @@ class DbTex:

             self.xslbuild = self.xslmain

             return

-        f = file(wrapper, "w")

+        f = open(wrapper, "wt", encoding="latin-1")

         f.write(self.xsl_header)

-        f.write('<xsl:import href="%s"/>\n' % path_to_uri(self.xslmain))

+        f.write(u'<xsl:import href="%s"/>\n' % path_to_uri(self.xslmain))

         for xsluser in self.xslusers:

-            f.write('<xsl:import href="%s"/>\n' % path_to_uri(xsluser))

+            f.write(u'<xsl:import href="%s"/>\n' % path_to_uri(xsluser))

         # Reverse to set the latest parameter first (case of overriding)

         self.xslparams.reverse()

@@ -231,8 +250,8 @@ class DbTex:

                               self.listings, opts=self.xslopts, params=param)

         else:

             self.log.info("No external file support")

-            f = file(self.listings, "w")

-            f.write("<listings/>\n")

+            f = open(self.listings, "wt", encoding="latin-1")

+            f.write(u"<listings/>\n")

             f.close()

     def _single_setup(self):

@@ -254,7 +273,7 @@ class DbTex:

                           "Use the working directory")

             self.outputdir = self.cwdir

-        f = open(doclist)

+        f = open(doclist, "rt", encoding="latin-1")

         books = f.readlines()

         f.close()

@@ -268,11 +287,11 @@ class DbTex:

         # set list

         self.log.info("Build the book set list...")

         xslset = "doclist.xsl"

-        f = file(xslset, "w")

+        f = open(xslset, "wt", encoding="latin-1")

         f.write(self.xsl_header)

-        f.write('<xsl:import href="%s"/>\n' % path_to_uri(self.xslbuild))

-        f.write('<xsl:import href="%s"/>\n' % path_to_uri(self.xslset))

-        f.write('</xsl:stylesheet>\n')

+        f.write(u'<xsl:import href="%s"/>\n' % path_to_uri(self.xslbuild))

+        f.write(u'<xsl:import href="%s"/>\n' % path_to_uri(self.xslset))

+        f.write(u'</xsl:stylesheet>\n')

         f.close()

         doclist = os.path.join(self.tmpdir, "doclist.txt")

@@ -369,7 +388,7 @@ class DbTex:

         # Need to dump the stdin input, because of the two passes

         self.input = os.path.join(self.tmpdir, "stdin.xml")

-        f = open(self.input, "w")

+        f = open(self.input, "wt", encoding="latin-1")

         for line in sys.stdin:

             f.write(line)

         f.close()

@@ -395,15 +414,15 @@ class DbTex:

         self.update_texinputs()

         # For easy debug

-        if self.debug and os.environ.has_key("TEXINPUTS"):

+        if self.debug and "TEXINPUTS" in os.environ:

             if os.name != "nt":

-                f = file("env_tex", "w")

-                f.write("TEXINPUTS=%s\nexport TEXINPUTS\n" % \

+                f = open("env_tex", "wt")

+                f.write(u"TEXINPUTS=%s\nexport TEXINPUTS\n" % \

                         os.environ["TEXINPUTS"])

                 f.close()

             else:

-                f = file("env_tex.bat", "w")

-                f.write("set TEXINPUTS=%s\n" % os.environ["TEXINPUTS"])

+                f = open("env_tex.bat", "wt")

+                f.write(u"set TEXINPUTS=%s\n" % os.environ["TEXINPUTS"])

                 f.close()

         # Build the tex file(s), and compile it(them)

@@ -544,13 +563,13 @@ class DbTexCommand:

         if options.format:

             try:

                 run.set_format(options.format)

-            except Exception, e:

+            except Exception as e:

                 failed_exit("Error: %s" % e)

         # Always set the XSLT (default or not)

         try:

             run.set_xslt(options.xslt)

-        except Exception, e:

+        except Exception as e:

             failed_exit("Error: %s" % e)

         if options.xslopts:

@@ -575,7 +594,7 @@ class DbTexCommand:

         if options.texstyle:

             try:

                 xslparam, texpath = texstyle_parse(options.texstyle)

-            except Exception, e:

+            except Exception as e:

                 failed_exit("Error: %s" % e)

             run.xslparams.append(xslparam)

             if texpath: run.texinputs.append(texpath)

@@ -630,7 +649,7 @@ class DbTexCommand:

             if not(os.path.exists(options.tmpdir)):

                 try:

                     os.mkdir(options.tmpdir)

-                except Exception, e:

+                except Exception as e:

                     failed_exit("Error: %s" % e)

             run.tmpdir_user = os.path.abspath(options.tmpdir)

@@ -665,7 +684,7 @@ class DbTexCommand:

         if options.version:

             version = run.get_version()

-            print "%s version %s" % (self.prog, version)

+            print("%s version %s" % (self.prog, version))

             if not(args):

                 sys.exit(0)

@@ -682,14 +701,14 @@ class DbTexCommand:

             try:

                 conf.paths = self.get_config_paths()

                 conf.fromstyle(options.style)

-            except Exception, e:

+            except Exception as e:

                 failed_exit("Error: %s" % e)

         if options.config:

             try:

                 for config in options.config:

                     conf.fromfile(config)

-            except Exception, e:

+            except Exception as e:

                 failed_exit("Error: %s" % e)

         if conf.options:

@@ -735,7 +754,7 @@ class DbTexCommand:

         # Try to buid the file

         try:

             run.compile()

-        except Exception, e:

+        except Exception as e:

             signal_error(self, e)

             failed_exit("Error: %s" % e)

diff --git a/lib/dbtexmf/core/error.py b/lib/dbtexmf/core/error.py

index 4bf44ee..2d71599 100644

--- a/lib/dbtexmf/core/error.py

+++ b/lib/dbtexmf/core/error.py

@@ -4,6 +4,8 @@

 #   error handler.

 # - A general API.

 #

+from __future__ import print_function

+

 import sys

 import traceback

@@ -49,7 +51,7 @@ def signal_error(*args, **kwargs):

 def failure_track(msg):

     global _dump_stack

-    print >>sys.stderr, (msg)

+    print((msg), file=sys.stderr)

     if _dump_stack:

         traceback.print_exc()

diff --git a/lib/dbtexmf/core/imagedata.py b/lib/dbtexmf/core/imagedata.py

index ebbd5c7..d01d93a 100644

--- a/lib/dbtexmf/core/imagedata.py

+++ b/lib/dbtexmf/core/imagedata.py

@@ -3,9 +3,13 @@ import os

 import re

 import shutil

 import logging

-import urllib

 from dbtexmf.core.error import signal_error

-from commander import CommandRunner

+from dbtexmf.core.commander import CommandRunner

+

+try:

+    from urllib import url2pathname

+except ImportError:

+    from urllib.request import url2pathname

 class ObjectFilter:

     """

@@ -258,8 +262,10 @@ class Imagedata:

                                                       backend=backend)

     def convert(self, fig):

+        fig = fig.decode("utf-8")

+

         # Translate the URL to an actual local path

-        fig = urllib.url2pathname(fig)

+        fig = url2pathname(fig)

         # Always use '/' in path: work even on windows and is required by tex

         if os.path.sep != '/': fig = fig.replace(os.path.sep, '/')

@@ -273,7 +279,7 @@ class Imagedata:

             return fig

         # Check if this image has been already converted

-        if self.converted.has_key(realfig):

+        if realfig in self.converted:

             self.log.info("Image '%s' already converted as %s" % \

                   (fig, self.converted[realfig]))

             return self.converted[realfig]

@@ -306,7 +312,7 @@ class Imagedata:

         conv.log = self.log

         conv.convert(realfig, newfig, self.output_format)

         self.converted[realfig] = newfig

-        return newfig

+        return self._path_encode(newfig)

     def _safe_file(self, fig, realfig, ext):

         """

@@ -316,7 +322,7 @@ class Imagedata:

         # Encode to expected output format. If encoding is OK and 

         # supported by tex, just return the encoded path

         newfig = self._path_encode(fig)

-        if newfig and newfig.find(" ") == -1:

+        if newfig and newfig.find(b" ") == -1:

             return newfig

         # Added to the converted list

@@ -326,17 +332,17 @@ class Imagedata:

         # Do the copy

         shutil.copyfile(realfig, newfig)

-        return newfig

+        return self._path_encode(newfig)

     def _path_encode(self, fig):

         # Actually, only ASCII characters are sure to match filesystem encoding

         # so let's be conservative

-        if self.output_encoding == "utf8":

-            return fig

+        if self.output_encoding == "utf-8":

+            return fig.encode("utf-8")

         try:

-            newfig = fig.decode("utf8").encode("ascii")

+            newfig = fig.encode("ascii")

         except:

-            newfig = ""

+            newfig = b""

         return newfig

     def scanformat(self, fig):

diff --git a/lib/dbtexmf/core/sgmlxml.py b/lib/dbtexmf/core/sgmlxml.py

index 30e6b84..80b28b3 100644

--- a/lib/dbtexmf/core/sgmlxml.py

+++ b/lib/dbtexmf/core/sgmlxml.py

@@ -7,6 +7,7 @@ import sys

 import re

 import logging

 from subprocess import call

+from io import open

 class Osx:

     def __init__(self):

@@ -20,7 +21,7 @@ class Osx:

     def replace_entities(self, entfile, mapfile, outfile=None):

         # Find out the SDATA entities to replace

         re_ent = re.compile('')

-        f = open(entfile)

+        f = open(entfile, "rt", encoding="latin-1")

         lines = f.readlines()

         f.close()

@@ -37,7 +38,7 @@ class Osx:

         entpat = "^(%s)\s+[^\s]+\s+0(x[^\s]+)" % "|".join([x for x, y in ents])

         re_map = re.compile(entpat)

         entmap = []

-        f = open(mapfile)

+        f = open(mapfile, "rt", encoding="latin-1")

         for line in f:

             entmap += re_map.findall(line.split("#")[0])

         f.close()

@@ -63,18 +64,18 @@ class Osx:

                 del entdict[ent]

         if not(outfile): outfile = entfile

-        f = open(outfile, "w")

+        f = open(outfile, "wt", encoding="latin-1")

         f.writelines(nlines)

         f.close()

     def run(self, sgmlfile, xmlfile):

         errfile = "errors.osx"

-        f = open(xmlfile, "w")

+        f = open(xmlfile, "wb")

         rc = call(["osx"] + self.opts + ["-f", errfile, sgmlfile], stdout=f)

         f.close()

         if rc != 0:

             i = 0

-            f = open(errfile)

+            f = open(errfile, "rt")

             for line in f:

                 sys.stderr.write(line)

                 i += 1

diff --git a/lib/dbtexmf/core/txtparser.py b/lib/dbtexmf/core/txtparser.py

index 709d877..cc0c4bd 100644

--- a/lib/dbtexmf/core/txtparser.py

+++ b/lib/dbtexmf/core/txtparser.py

@@ -3,6 +3,7 @@

 #

 import os

 import re

+from io import open

 #

 # Functions used by the config parsers and by the dbtex command parser

@@ -86,7 +87,7 @@ class TextConfig:

     def fromfile(self, file):

         dir = os.path.dirname(os.path.realpath(file))

-        f = open(file)

+        f = open(file, "rt")

         for line in f:

             # Remove the comment

@@ -96,7 +97,7 @@ class TextConfig:

                 continue

             key = m.group(1)

             value = m.group(2).strip()

-            if not self.conf_mapping.has_key(key):

+            if key not in self.conf_mapping:

                 continue

             o = self.conf_mapping[key]

diff --git a/lib/dbtexmf/core/xmlparser.py b/lib/dbtexmf/core/xmlparser.py

index 501b7f7..25b1230 100644

--- a/lib/dbtexmf/core/xmlparser.py

+++ b/lib/dbtexmf/core/xmlparser.py

@@ -1,7 +1,7 @@

 import os

 import re

 import xml.etree.ElementTree as ET

-from txtparser import texinputs_parse

+from dbtexmf.core.txtparser import texinputs_parse

 class BaseOption:

     def __init__(self, config, optname):

diff --git a/lib/dbtexmf/dblatex/dblatex.py b/lib/dbtexmf/dblatex/dblatex.py

index 0e9ae71..e22b965 100644

--- a/lib/dbtexmf/dblatex/dblatex.py

+++ b/lib/dbtexmf/dblatex/dblatex.py

@@ -7,8 +7,8 @@ import os

 from dbtexmf.core.sgmlxml import Osx

 from dbtexmf.core.dbtex import DbTex, DbTexCommand

-from rawtex import RawLatex

-from runtex import RunLatex

+from dbtexmf.dblatex.rawtex import RawLatex

+from dbtexmf.dblatex.runtex import RunLatex

 class DbLatex(DbTex):

diff --git a/lib/dbtexmf/dblatex/grubber/bibtex.py b/lib/dbtexmf/dblatex/grubber/bibtex.py

index 7615cfc..296a992 100644

--- a/lib/dbtexmf/dblatex/grubber/bibtex.py

+++ b/lib/dbtexmf/dblatex/grubber/bibtex.py

@@ -18,11 +18,12 @@ import os, sys

 from os.path import *

 import re, string

 import subprocess

+from io import open

 #from grubber import _

 #from grubber import *

-from msg import _, msg

-from plugins import TexModule

+from dbtexmf.dblatex.grubber.msg import _, msg

+from dbtexmf.dblatex.grubber.plugins import TexModule

 re_bibdata = re.compile(r"\\bibdata{(?P<data>.*)}")

 re_citation = re.compile(r"\\citation{(?P.*)}")

@@ -111,7 +112,7 @@ class BibTex(TexModule):

         """

         if self.style:

             old_bst = self.style + ".bst"

-            if exists(old_bst) and self.doc.sources.has_key(old_bst):

+            if exists(old_bst) and old_bst in self.doc.sources:

                 del self.doc.sources[old_bst]

         self.style = style

@@ -174,7 +175,7 @@ class BibTex(TexModule):

                         pkg="bibtex")

                 return 1

-        blg = open(self.blgfile)

+        blg = open(self.blgfile, "rt", encoding="latin-1")

         for line in blg.readlines():

             if re_error.search(line):

                 blg.close()

@@ -202,12 +203,12 @@ class BibTex(TexModule):

             auxfiles.append(self.auxfile)

         for auxname in auxfiles:

-            aux = open(auxname)

+            aux = open(auxname, "rt", encoding="latin-1")

             for line in aux:

                 m = re_citation.match(line)

                 if m:

                     cite = m.group("cite")

-                    if not cites.has_key(cite):

+                    if cite not in cites:

                         last = last + 1

                         cites[cite] = last

                     continue

@@ -358,7 +359,7 @@ class BibTex(TexModule):

         """

         if not exists(self.blgfile):

             return 0

-        log = open(self.blgfile)

+        log = open(self.blgfile, "rt", encoding="latin-1")

         line = log.readline()

         while line != "":

             if line.startswith("The style file: "):

@@ -376,7 +377,7 @@ class BibTex(TexModule):

         """

         if not exists(self.blgfile):

             return

-        log = open(self.blgfile)

+        log = open(self.blgfile, "rt", encoding="latin-1")

         last_line = ""

         for line in log:

             m = re_error.search(line)

@@ -400,9 +401,9 @@ class BibTex(TexModule):

                 file = d["file"]

                 if file[-4:] == ".bib":

                     file = file[:-4]

-                if self.db.has_key(file):

+                if file in self.db:

                     d["file"] = self.db[file]

-                elif self.db.has_key(file + ".bib"):

+                elif file + ".bib" in self.db:

                     d["file"] = self.db[file + ".bib"]

                 yield d

             last_line = line

diff --git a/lib/dbtexmf/dblatex/grubber/bibtopic.py b/lib/dbtexmf/dblatex/grubber/bibtopic.py

index 4c1ef9f..af36830 100644

--- a/lib/dbtexmf/dblatex/grubber/bibtopic.py

+++ b/lib/dbtexmf/dblatex/grubber/bibtopic.py

@@ -1,6 +1,6 @@

-from plugins import TexModule

-from bibtex import BibTex

+from dbtexmf.dblatex.grubber.plugins import TexModule

+from dbtexmf.dblatex.grubber.bibtex import BibTex

 class BibSect(BibTex):

diff --git a/lib/dbtexmf/dblatex/grubber/dvips.py b/lib/dbtexmf/dblatex/grubber/dvips.py

index 83bafa7..43f9326 100644

--- a/lib/dbtexmf/dblatex/grubber/dvips.py

+++ b/lib/dbtexmf/dblatex/grubber/dvips.py

@@ -13,9 +13,9 @@ import os

 from os.path import *

 import subprocess

-from msg import _ , msg

-from plugins import TexModule

-from maker import Depend

+from dbtexmf.dblatex.grubber.msg import _ , msg

+from dbtexmf.dblatex.grubber.plugins import TexModule

+from dbtexmf.dblatex.grubber.maker import Depend

 class Dep (Depend):

     def __init__ (self, doc, target, source, node):

diff --git a/lib/dbtexmf/dblatex/grubber/index.py b/lib/dbtexmf/dblatex/grubber/index.py

index 2194b02..564ff8f 100644

--- a/lib/dbtexmf/dblatex/grubber/index.py

+++ b/lib/dbtexmf/dblatex/grubber/index.py

@@ -38,6 +38,7 @@ this argument, they apply to all indices declared at the point where they

 occur.

 """

+import sys

 import os

 from os.path import *

 import re, string

@@ -45,9 +46,11 @@ import subprocess

 import xml.dom.minidom

 from subprocess import Popen, PIPE

-from msg import _, msg

-from plugins import TexModule

-from util import md5_file

+from io import open

+

+from dbtexmf.dblatex.grubber.msg import _, msg

+from dbtexmf.dblatex.grubber.plugins import TexModule

+from dbtexmf.dblatex.grubber.util import md5_file