mirror of
https://github.com/laramies/theHarvester.git
synced 2024-09-20 23:37:00 +08:00
Fix conflict
This commit is contained in:
commit
af4b0e1a4c
2
Pipfile
2
Pipfile
|
@ -16,7 +16,7 @@ netaddr = "==0.8.0"
|
|||
plotly = "==4.14.1"
|
||||
pyppeteer = "==0.2.2"
|
||||
PyYAML = "==5.3.1"
|
||||
requests = "==2.25.0"
|
||||
requests = "==2.25.1"
|
||||
retrying = "==1.3.3"
|
||||
shodan = "==1.24.0"
|
||||
texttable = "==1.6.3"
|
||||
|
|
8
Pipfile.lock
generated
8
Pipfile.lock
generated
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"_meta": {
|
||||
"hash": {
|
||||
"sha256": "389c58fb37c39f59787cef9d55ae5481ab098b3c21118cb3f9efd0420327eb90"
|
||||
"sha256": "9ecc3d87a4d32efe41e22b8a2d413697e970751c02eff470932f6db58605a777"
|
||||
},
|
||||
"pipfile-spec": 6,
|
||||
"requires": {},
|
||||
|
@ -395,11 +395,11 @@
|
|||
},
|
||||
"requests": {
|
||||
"hashes": [
|
||||
"sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8",
|
||||
"sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"
|
||||
"sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
|
||||
"sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.25.0"
|
||||
"version": "==2.25.1"
|
||||
},
|
||||
"retrying": {
|
||||
"hashes": [
|
||||
|
|
|
@ -19,8 +19,10 @@ if __name__ == '__main__':
|
|||
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
|
||||
|
|
|
@ -10,7 +10,7 @@ netaddr==0.8.0
|
|||
plotly==4.14.1
|
||||
pyppeteer==0.2.2
|
||||
PyYAML==5.3.1
|
||||
requests==2.25.0
|
||||
requests==2.25.1
|
||||
retrying==1.3.3
|
||||
shodan==1.24.0
|
||||
texttable==1.6.3
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
# coding=utf-8
|
||||
|
||||
from typing import Set, Union, Any, Tuple, List
|
||||
import yaml
|
||||
import asyncio
|
||||
|
@ -11,7 +12,7 @@
|
|||
class Core:
|
||||
@staticmethod
|
||||
def version() -> str:
|
||||
return '3.2.2dev1'
|
||||
return '3.2.2'
|
||||
|
||||
@staticmethod
|
||||
def api_keys() -> dict:
|
||||
|
|
Loading…
Reference in a new issue