From d90f90988ade2c3519beb52ffcae6be3bb604b60 Mon Sep 17 00:00:00 2001 From: Alexander Graf <17130992+aandergr@users.noreply.github.com> Date: Mon, 8 Jun 2020 17:01:42 +0200 Subject: [PATCH] Fix ValueError when executing from other drive on Windows Fixes #671. --- instaloader/__main__.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/instaloader/__main__.py b/instaloader/__main__.py index ad66827..9862960 100644 --- a/instaloader/__main__.py +++ b/instaloader/__main__.py @@ -16,20 +16,10 @@ from .instaloader import get_default_session_filename from .instaloadercontext import default_user_agent -def get_simple_argv0() -> str: - if platform.system() != "Windows": - argv0 = os.path.basename(sys.argv[0]) - else: - dirname = os.path.relpath(os.path.dirname(sys.argv[0])) - basename = os.path.basename(sys.argv[0]) - argv0 = os.path.join(dirname, basename) - argv0 = "instaloader" if argv0 == "__main__.py" else argv0 - return argv0 - - def usage_string(): # NOTE: duplicated in README.rst and docs/index.rst - argv0 = get_simple_argv0() + argv0 = os.path.basename(sys.argv[0]) + argv0 = "instaloader" if argv0 == "__main__.py" else argv0 return """ {0} [--comments] [--geotags] {2:{1}} [--stories] [--highlights] [--tagged] [--igtv]