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

Unmix return and yield from from a single function

Author: arunkannawadi

requirements.txt

@@ -3,7 +3,7 @@ beautifulsoup4
 bibtexparser
 deprecated
 fake_useragent
-free-proxy<1.1.0
+free-proxy
 python-dotenv
 requests[socks]
 selenium

scholarly/_proxy_generator.py

@@ -483,7 +483,10 @@ def _fp_coroutine(self, timeout=1, wait_time=120):
         freeproxy = FreeProxy(rand=False, timeout=timeout)
         if not hasattr(self, '_dirty_freeproxies'):
             self._dirty_freeproxies = set()
-        all_proxies = freeproxy.get_proxy_list()
+        try:
+            all_proxies = freeproxy.get_proxy_list(repeat=False)  # free-proxy >= 1.1.0
+        except TypeError:
+            all_proxies = freeproxy.get_proxy_list()  # free-proxy < 1.1.0
         all_proxies.reverse()  # Try the older proxies first
 
         t1 = time.time()

scholarly/_scholarly.py

@@ -305,6 +305,9 @@ def citedby(self, object: Publication)->_SearchScholarIterator:
             # Go one year at a time in decreasing order
             years = zip(range(year_end, year_low-1, -1), range(year_end, year_low-1, -1))
 
+        return self._citedby_long(object,years)
+
+    def _citedby_long(self, object: Publication, years):
         # Extract cites_id. Note: There could be multiple ones, separated by commas.
         m = re.search("cites=[\d+,]*", object["citedby_url"])
         pub_id = m.group()[6:]