From c3b2d6c5f8aa58df31e1ab63e2d54549e5b8f474 Mon Sep 17 00:00:00 2001 From: HurinHu Date: Sun, 29 May 2022 23:00:01 +1200 Subject: [PATCH 1/4] fixed datetime parse None issue --- GoogleNews/__init__.py | 8 ++++++-- setup.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/GoogleNews/__init__.py b/GoogleNews/__init__.py index f55c0c8..ec4caa2 100644 --- a/GoogleNews/__init__.py +++ b/GoogleNews/__init__.py @@ -38,7 +38,9 @@ def define_date(date): try: if ' ago' in date.lower(): q = int(date.split()[-3]) - if 'hour' in date.lower(): + if 'minutes' in date.lower(): + return datetime.datetime.now() + relativedelta(minutes=-q) + elif 'hour' in date.lower(): return datetime.datetime.now() + relativedelta(hours=-q) elif 'day' in date.lower(): return datetime.datetime.now() + relativedelta(days=-q) @@ -46,6 +48,8 @@ def define_date(date): return datetime.datetime.now() + relativedelta(days=-7*q) elif 'month' in date.lower(): return datetime.datetime.now() + relativedelta(months=-q) + elif 'yesterday' in date.lower(): + return datetime.datetime.now() + relativedelta(days=-1) else: for month in months.keys(): if month.lower()+' ' in date.lower(): @@ -75,7 +79,7 @@ def __init__(self,lang="en",period="",start="",end="",encode="utf-8",region=None self.__start = start self.__end = end self.__encode = encode - self.__version = '1.6.2' + self.__version = '1.6.3' def getVersion(self): return self.__version diff --git a/setup.py b/setup.py index 0a9d217..639c36b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="GoogleNews", - version="1.6.2", + version="1.6.3", author="Hurin Hu", author_email="hurin@live.ca", description="Google News search for Python", From e673c8baf564a45db32d169a9c69124e69609214 Mon Sep 17 00:00:00 2001 From: Eugene P Date: Thu, 16 Jun 2022 09:37:55 +0300 Subject: [PATCH 2/4] fix search problem. (#95) --- GoogleNews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleNews/__init__.py b/GoogleNews/__init__.py index ec4caa2..0184eb6 100644 --- a/GoogleNews/__init__.py +++ b/GoogleNews/__init__.py @@ -136,7 +136,7 @@ def build_response(self): else: #TODO might want to add output for user to know no data was found return - result = self.content.find_all("div", id="search")[0].find_all("g-card") + result = self.content.find_all("div", id="search")[0].find("div", id="rso").children return result def page_at(self, page=1): From 1e44d8d44c5577ede2df058cb6ad26a13e1bee07 Mon Sep 17 00:00:00 2001 From: HurinHu Date: Thu, 16 Jun 2022 18:50:10 +1200 Subject: [PATCH 3/4] updated version number --- GoogleNews/__init__.py | 2 +- setup.py | 2 +- test/test_search.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GoogleNews/__init__.py b/GoogleNews/__init__.py index 0184eb6..706fd7c 100644 --- a/GoogleNews/__init__.py +++ b/GoogleNews/__init__.py @@ -79,7 +79,7 @@ def __init__(self,lang="en",period="",start="",end="",encode="utf-8",region=None self.__start = start self.__end = end self.__encode = encode - self.__version = '1.6.3' + self.__version = '1.6.4' def getVersion(self): return self.__version diff --git a/setup.py b/setup.py index 639c36b..95e0de7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="GoogleNews", - version="1.6.3", + version="1.6.4", author="Hurin Hu", author_email="hurin@live.ca", description="Google News search for Python", diff --git a/test/test_search.py b/test/test_search.py index ae0f86d..20082ec 100644 --- a/test/test_search.py +++ b/test/test_search.py @@ -51,7 +51,7 @@ class TestStringMethods(unittest.TestCase): def testVersion(self): googlenews = GoogleNews() - version = '1.6.3' + version = '1.6.4' self.assertIn(version, googlenews.getVersion()) print('Latest version matched') From 6f7c82f2ebaa44fa062a87f5683ac8c70d2e5903 Mon Sep 17 00:00:00 2001 From: HurinHu Date: Sun, 21 Aug 2022 23:30:12 +1200 Subject: [PATCH 4/4] fixed google code changes --- GoogleNews/__init__.py | 8 ++++---- setup.py | 2 +- test/test_search.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GoogleNews/__init__.py b/GoogleNews/__init__.py index 706fd7c..5cdf385 100644 --- a/GoogleNews/__init__.py +++ b/GoogleNews/__init__.py @@ -79,7 +79,7 @@ def __init__(self,lang="en",period="",start="",end="",encode="utf-8",region=None self.__start = start self.__end = end self.__encode = encode - self.__version = '1.6.4' + self.__version = '1.6.5' def getVersion(self): return self.__version @@ -136,7 +136,7 @@ def build_response(self): else: #TODO might want to add output for user to know no data was found return - result = self.content.find_all("div", id="search")[0].find("div", id="rso").children + result = self.content.find_all("a",{"jsname" : re.compile(r".*")})[3:-1] return result def page_at(self, page=1): @@ -164,7 +164,7 @@ def page_at(self, page=1): except Exception: tmp_text = '' try: - tmp_link = item.find("a").get("href") + tmp_link = item.get("href") except Exception: tmp_link = '' try: @@ -218,7 +218,7 @@ def get_page(self, page=1): except Exception: tmp_text = '' try: - tmp_link = item.find("a").get("href") + tmp_link = item.get("href") except Exception: tmp_link = '' try: diff --git a/setup.py b/setup.py index 95e0de7..7c05fa3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="GoogleNews", - version="1.6.4", + version="1.6.5", author="Hurin Hu", author_email="hurin@live.ca", description="Google News search for Python", diff --git a/test/test_search.py b/test/test_search.py index 20082ec..b548fce 100644 --- a/test/test_search.py +++ b/test/test_search.py @@ -51,7 +51,7 @@ class TestStringMethods(unittest.TestCase): def testVersion(self): googlenews = GoogleNews() - version = '1.6.4' + version = '1.6.5' self.assertIn(version, googlenews.getVersion()) print('Latest version matched')