diff --git a/src/downloader.py b/src/downloader.py index 3c21f32..ea62f0f 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -4,19 +4,13 @@ import sys import urllib.request from pathlib import Path +import imgurpython + from src.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError, FileNameTooLong, ImgurLoginError, NotADownloadableLinkError) from src.tools import GLOBAL, nameCorrector, printToFile -try: - from imgurpython import * -except ModuleNotFoundError: - print("\nimgurpython not found on your computer, installing...\n") - from src.tools import install - install("imgurpython") - from imgurpython import * - VanillaPrint = print print = printToFile diff --git a/src/searcher.py b/src/searcher.py index ecb88e0..06ccb70 100644 --- a/src/searcher.py +++ b/src/searcher.py @@ -3,14 +3,7 @@ import random import socket import webbrowser -try: - import praw -except ModuleNotFoundError: - print("\nPRAW not found on your computer, installing...\n") - from src.tools import install - install("praw") - import praw - +import praw from prawcore.exceptions import NotFound, ResponseException, Forbidden from src.tools import GLOBAL, createLogFile, jsonFile, printToFile diff --git a/src/tools.py b/src/tools.py index 1d7648a..16af577 100644 --- a/src/tools.py +++ b/src/tools.py @@ -2,20 +2,11 @@ import io import json import sys import time - -try: - from pip import main as pipmain -except: - from pip._internal import main as pipmain - from os import makedirs, path, remove from pathlib import Path from src.errors import FileNotFoundError -def install(package): - pipmain(['install', package]) - class GLOBAL: """Declare global variables"""