From 16c568eab96fc4290de7a2a8de98ac5e0b9bf076 Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 13 Jul 2020 20:33:41 +0200 Subject: [PATCH] Removed useless function assign to variable --- ebook_converter/__init__.py | 3 --- ebook_converter/ebooks/metadata/__init__.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ebook_converter/__init__.py b/ebook_converter/__init__.py index f893e6a..c998735 100644 --- a/ebook_converter/__init__.py +++ b/ebook_converter/__init__.py @@ -206,9 +206,6 @@ class CurrentDir(object): pass -relpath = os.path.relpath - - def walk(dir): ''' A nice interface to os.walk ''' for record in os.walk(dir): diff --git a/ebook_converter/ebooks/metadata/__init__.py b/ebook_converter/ebooks/metadata/__init__.py index 42b590b..a20e24c 100644 --- a/ebook_converter/ebooks/metadata/__init__.py +++ b/ebook_converter/ebooks/metadata/__init__.py @@ -8,7 +8,7 @@ import re import sys import urllib.parse -from ebook_converter import relpath, prints, force_unicode +from ebook_converter import prints, force_unicode from ebook_converter.utils.config_base import tweaks from ebook_converter.polyglot.urllib import unquote @@ -271,7 +271,7 @@ class Resource(object): if self.path == basedir: return '' + frag try: - rpath = relpath(self.path, basedir) + rpath = os.path.relpath(self.path, basedir) except OSError: # On windows path and basedir could be on different drives rpath = self.path return urllib.parse.quote(rpath.replace(os.sep, '/')) + frag