move user agent string to util.py

gallery_dl/extractor/danbooru.py

@@ -9,7 +9,7 @@
 """Extractors for https://danbooru.donmai.us/ and other Danbooru instances"""
 
 from .common import BaseExtractor, Message
-from .. import text, version
+from .. import text, util
 import datetime
 
 
@@ -20,6 +20,7 @@ class DanbooruExtractor(BaseExtractor):
     page_limit = 1000
     page_start = None
     per_page = 200
+    request_interval = 1.0
 
     def __init__(self, match):
         BaseExtractor.__init__(self, match)
@@ -45,7 +46,7 @@ class DanbooruExtractor(BaseExtractor):
         return pages * self.per_page
 
     def items(self):
-        self.session.headers["User-Agent"] = version.__useragent__
+        self.session.headers["User-Agent"] = util.USERAGENT
 
         includes = self.config("metadata")
         if includes:

gallery_dl/extractor/e621.py

@@ -10,7 +10,7 @@
 
 from .common import Message
 from . import danbooru
-from .. import text, version
+from .. import text, util
 
 
 class E621Extractor(danbooru.DanbooruExtractor):
@@ -22,8 +22,7 @@ class E621Extractor(danbooru.DanbooruExtractor):
     request_interval_min = 1.0
 
     def items(self):
-        self.session.headers["User-Agent"] = \
-            version.__useragent__ + " (by mikf)"
+        self.session.headers["User-Agent"] = util.USERAGENT + " (by mikf)"
 
         includes = self.config("metadata") or ()
         if includes:

gallery_dl/extractor/mangadex.py

@@ -9,7 +9,7 @@
 """Extractors for https://mangadex.org/"""
 
 from .common import Extractor, Message
-from .. import text, util, version, exception
+from .. import text, util, exception
 from ..cache import cache, memcache
 from collections import defaultdict
 
@@ -30,7 +30,7 @@ class MangadexExtractor(Extractor):
 
     def __init__(self, match):
         Extractor.__init__(self, match)
-        self.session.headers["User-Agent"] = version.__useragent__
+        self.session.headers["User-Agent"] = util.USERAGENT
         self.api = MangadexAPI(self)
         self.uuid = match.group(1)
 

gallery_dl/util.py

@@ -24,7 +24,7 @@ import subprocess
 import urllib.parse
 from http.cookiejar import Cookie
 from email.utils import mktime_tz, parsedate_tz
-from . import text, exception
+from . import text, version, exception
 
 
 def bencode(num, alphabet="0123456789"):
@@ -602,6 +602,7 @@ EPOCH = datetime.datetime(1970, 1, 1)
 SECOND = datetime.timedelta(0, 1)
 WINDOWS = (os.name == "nt")
 SENTINEL = object()
+USERAGENT = "gallery-dl/" + version.__version__
 SPECIAL_EXTRACTORS = {"oauth", "recursive", "test"}
 GLOBALS = {
     "contains" : contains,

gallery_dl/version.py

@@ -7,4 +7,3 @@
 # published by the Free Software Foundation.
 
 __version__ = "1.25.0-dev"
-__useragent__ = "gallery-dl/" + __version__