Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new: Timeout for connection/request, fixes #584 #585

Merged
merged 8 commits into from
May 21, 2020

Conversation

cvandeplas
Copy link
Member

This fixes feature request #528
In my own tests all went well, let's see what the automated tests say.

@cvandeplas
Copy link
Member Author

@Rafiot help, I don't understand what I should do to make Travis happy :-/

pymisp/api.py Outdated
@@ -104,6 +105,7 @@ def __init__(self, url: str, key: str, ssl: bool=True, debug: bool=False, proxie
self.cert: Optional[Tuple[str, tuple]] = cert
self.auth: Optional[AuthBase] = auth
self.tool: str = tool
self.timeout: float = timeout
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be
self.timeout: Optional[float, Tuple[float, float]] = timeout

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And then travis will be happy :)

@coveralls
Copy link

coveralls commented May 21, 2020

Coverage Status

Coverage decreased (-0.005%) to 36.713% when pulling f3b3f4c on cvandeplas:master into b021707 on MISP:master.

@Rafiot Rafiot merged commit 515a47a into MISP:master May 21, 2020
@Rafiot
Copy link
Member

Rafiot commented May 21, 2020

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants