From f93ad83d0410439861afd863b24a2c1b0ca9ce23 Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:09:18 +0000 Subject: [PATCH 1/6] temp fix for uvloop on py3.9 --- requirements/base.txt | 2 +- theHarvester.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4014d413..70a89d08 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,4 +15,4 @@ retrying==1.3.3 shodan==1.24.0 texttable==1.6.3 lxml==4.6.2 -uvloop==0.14.0; platform_system != "Windows" \ No newline at end of file +uvloop==0.14.0; platform_system != "Windows"; python_version < '3.9' \ No newline at end of file diff --git a/theHarvester.py b/theHarvester.py index c728b0d8..4c96d15f 100755 --- a/theHarvester.py +++ b/theHarvester.py @@ -19,8 +19,10 @@ multiprocessing.freeze_support() asyncio.DefaultEventLoopPolicy = asyncio.WindowsSelectorEventLoopPolicy else: - import uvloop - uvloop.install() + if python_version()[0:3] < '3.9': + import uvloop + uvloop.install() + if "linux" in platform: import aiomultiprocess # As we are not using Windows we can change the spawn method to fork for greater performance From 91cc52f1afd69ebb39953da55fdc319e5800f32f Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:19:01 +0000 Subject: [PATCH 2/6] temp fix for uvloop on py3.9 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 70a89d08..c01d8331 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,4 +15,4 @@ retrying==1.3.3 shodan==1.24.0 texttable==1.6.3 lxml==4.6.2 -uvloop==0.14.0; platform_system != "Windows"; python_version < '3.9' \ No newline at end of file +uvloop==0.14.0; platform_system != "Windows" ; python_version < '3.9' \ No newline at end of file From 287b5fff9d2f51bd5bfe5b5b031b2548c5fc3db4 Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:22:08 +0000 Subject: [PATCH 3/6] temp fix for uvloop on py3.9 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index c01d8331..c35e4b4f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,4 +15,4 @@ retrying==1.3.3 shodan==1.24.0 texttable==1.6.3 lxml==4.6.2 -uvloop==0.14.0; platform_system != "Windows" ; python_version < '3.9' \ No newline at end of file +uvloop==0.14.0; platform_system != "Windows" ; python_version != "3.9" \ No newline at end of file From b7963a89e4511b192110112020788d173ac1bd3c Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:24:39 +0000 Subject: [PATCH 4/6] temp fix for uvloop on py3.9 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index c35e4b4f..68cb8114 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,4 +15,4 @@ retrying==1.3.3 shodan==1.24.0 texttable==1.6.3 lxml==4.6.2 -uvloop==0.14.0; platform_system != "Windows" ; python_version != "3.9" \ No newline at end of file +uvloop==0.14.0; python_version != "3.9"; platform_system != "Windows" \ No newline at end of file From a30f41dde78a09f13754da6d04d4f138643d7506 Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:32:09 +0000 Subject: [PATCH 5/6] temp fix for uvloop on py3.9 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 68cb8114..4014d413 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -15,4 +15,4 @@ retrying==1.3.3 shodan==1.24.0 texttable==1.6.3 lxml==4.6.2 -uvloop==0.14.0; python_version != "3.9"; platform_system != "Windows" \ No newline at end of file +uvloop==0.14.0; platform_system != "Windows" \ No newline at end of file From 7db956bb6fff6318f6a5f80f481cf87edb255e9d Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 15 Dec 2020 22:34:30 +0000 Subject: [PATCH 6/6] bump release --- theHarvester/lib/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theHarvester/lib/core.py b/theHarvester/lib/core.py index e6a19eb0..69eae814 100644 --- a/theHarvester/lib/core.py +++ b/theHarvester/lib/core.py @@ -12,7 +12,7 @@ class Core: @staticmethod def version() -> str: - return '3.2.0' + return '3.2.1' @staticmethod def api_keys() -> dict: