Merge pull request #480 from scholarly-python-package/develop

(Pre-)Release v1.7.10 to enable conda build

Author: arunkannawadi

scholarly/_proxy_generator.py

@@ -14,7 +14,6 @@
 from selenium.common.exceptions import WebDriverException, UnexpectedAlertPresentException
 from selenium.webdriver.firefox.options import Options as FirefoxOptions
 from urllib.parse import urlparse
-from fake_useragent import UserAgent
 from contextlib import contextmanager
 from deprecated import deprecated
 try:
@@ -24,6 +23,13 @@
 except ImportError:
     stem = None
 
+try:
+    from fake_useragent import UserAgent
+    FAKE_USERAGENT = True
+except Exception:
+    FAKE_USERAGENT = False
+    DEFAULT_USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36'
+
 from .data_types import ProxyMode
 
 
@@ -454,13 +460,18 @@ def _new_session(self, **kwargs):
         # self._session = httpx.Client()
         self.got_403 = False
 
-        # Suppress the misleading traceback from UserAgent()
-        with self._suppress_logger('fake_useragent'):
-            _HEADERS = {
-                'accept-language': 'en-US,en',
-                'accept': 'text/html,application/xhtml+xml,application/xml',
-                'User-Agent': UserAgent().random,
-            }
+        if FAKE_USERAGENT:
+            # Suppress the misleading traceback from UserAgent()
+            with self._suppress_logger('fake_useragent'):
+                user_agent = UserAgent().random
+        else:
+            user_agent = DEFAULT_USER_AGENT
+
+        _HEADERS = {
+            'accept-language': 'en-US,en',
+            'accept': 'text/html,application/xhtml+xml,application/xml',
+            'User-Agent': user_agent,
+        }
         # self._session.headers.update(_HEADERS)
         init_kwargs.update(headers=_HEADERS)
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='scholarly',
-    version='1.7.9',
+    version='1.7.10-alpha',
     author='Steven A. Cholewiak, Panos Ipeirotis, Victor Silva, Arun Kannawadi',
     author_email='steven@cholewiak.com, panos@stern.nyu.edu, vsilva@ualberta.ca, arunkannawadi@astro.princeton.edu',
     description='Simple access to Google Scholar authors and citations',