diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py index 41229140..6fc3df3d 100644 --- a/gallery_dl/__init__.py +++ b/gallery_dl/__init__.py @@ -131,7 +131,7 @@ def main(): import requests extra = "" - if getattr(sys, "frozen", False): + if util.EXECUTABLE: extra = " - Executable" else: git_head = util.git_head() diff --git a/gallery_dl/config.py b/gallery_dl/config.py index f9f3147d..7067d4c0 100644 --- a/gallery_dl/config.py +++ b/gallery_dl/config.py @@ -38,7 +38,7 @@ else: ] -if getattr(sys, "frozen", False): +if util.EXECUTABLE: # look for config file in PyInstaller executable directory (#682) _default_configs.append(os.path.join( os.path.dirname(sys.executable), diff --git a/gallery_dl/job.py b/gallery_dl/job.py index 998de7a2..4c4e9259 100644 --- a/gallery_dl/job.py +++ b/gallery_dl/job.py @@ -78,7 +78,7 @@ class Job(): if version_info: self.kwdict[version_info] = { "version" : version.__version__, - "is_executable" : getattr(sys, "frozen", False), + "is_executable" : util.EXECUTABLE, "current_git_head": util.git_head() } diff --git a/gallery_dl/util.py b/gallery_dl/util.py index 85e4d34b..bf67a64d 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -603,6 +603,7 @@ SECOND = datetime.timedelta(0, 1) WINDOWS = (os.name == "nt") SENTINEL = object() USERAGENT = "gallery-dl/" + version.__version__ +EXECUTABLE = getattr(sys, "frozen", False) SPECIAL_EXTRACTORS = {"oauth", "recursive", "test"} GLOBALS = { "contains" : contains,