move crcUtils, logger, utilities to a utils submodule

CreateDatabase.py

@@ -1,6 +1,6 @@
 import os
 
-import logger
+from utils import logger
 import redditScraper
 import tumblrScraper
 import submission

LikedSavedDownloaderServer.py

@@ -16,7 +16,7 @@ import tornado.httpclient
 import tornado.gen
 
 # local imports
-import utilities
+from utils import utilities
 import settings
 import redditUserImageScraper
 import LikedSavedDatabase

imageSaver.py

@@ -6,7 +6,6 @@ import random
 import re
 import sys
 import time
-import utilities
 
 from builtins import str
 from operator import attrgetter
@@ -26,11 +25,12 @@ from gfycat.client import GfycatClient
 # local imports
 import LikedSavedDatabase
 import imgurDownloader
-import logger
+from utils import logger
+from utils import utilities
 import settings
 import submission as Submissions
 import videoDownloader
-from crcUtils import signedCrc32
+from utils.crcUtils import signedCrc32
 
 SupportedTypes = ['jpg', 'jpeg', 'gif', 'png', 'webm', 'mp4']
 

imgurDownloader.py

@@ -11,13 +11,13 @@ else:
 	from urllib import urlretrieve, urlopen
 
 # local imports
-from crcUtils import signedCrc32
+from utils.crcUtils import signedCrc32
 import LikedSavedDatabase
 import imageSaver
 import imgurpython as imgur
-import logger
+from utils import logger
 import settings
-import utilities
+from utils import utilities
 
 def isImgurIndirectUrl(url):
     # If it is imgur domain, has no file type, and isn't an imgur album

pixivScraper.py

@@ -3,7 +3,7 @@ from pixivpy3 import *
 
 # local imports
 from submission import Submission
-import logger
+from utils import logger
 
 # Note that this does NOT set the download URL, and won't set title to be unique for albums
 def fillPixivSubmission(illustration, submissionToFill):

redditScraper.py

@@ -4,7 +4,7 @@
 import praw
 
 # local imports
-import logger
+from utils import logger
 import settings
 import submission
 from submission import Submission

redditUserImageScraper.py

@@ -5,7 +5,7 @@ import os
 
 # local imports
 import LikedSavedDatabase
-import logger
+from utils import logger
 import imageSaver
 import redditScraper
 import tumblrScraper
@@ -13,7 +13,7 @@ import pixivScraper
 import imgurDownloader
 import settings
 import submission
-import utilities
+from utils import utilities
 
 scriptFinishedSentinel = '>>> runLikedSavedDownloader() Process Finished <<<'
 

tumblrScraper.py

@@ -4,9 +4,9 @@ from builtins import str
 import pytumblr
 
 # local imports
-import logger
+from utils import logger
 from submission import Submission
-from crcUtils import signedCrc32
+from utils.crcUtils import signedCrc32
 
 def getTumblrUserLikedSubmissions(clientId, clientSecret, tokenId, tokenSecret,
 	likeRequestLimit = 100, requestOnlyNewCache = None):

videoDownloader.py

@@ -5,7 +5,7 @@ import ssl
 import youtube_dl
 
 # local imports
-import logger
+from utils import logger
 import settings
 
 alreadyDownloadedSentinel = "Already Downloaded"