-
Notifications
You must be signed in to change notification settings - Fork 3
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
Do notation style #21
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8fbeefc
Added early return implementation, easy to use do-style notation
danielSanchezQ 36c024b
Added early return tests
danielSanchezQ b5c3320
Use old style typing for compatibility
danielSanchezQ b162973
Add latest python3 11 and 12 for tests
danielSanchezQ 7d46044
Fix comments
danielSanchezQ b549aad
Add decorator test
danielSanchezQ ce8e164
Added missing pragmas no cover
danielSanchezQ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
from rusty_results import Option, Some, Empty | ||
from rusty_results import early_return | ||
|
||
|
||
@early_return | ||
def fail_on_operation() -> Option[int]: | ||
value1 = Some(10) | ||
value2 = Empty() | ||
return Some(~value1 + ~value2) | ||
|
||
|
||
def success_on_operation() -> Option[int]: | ||
value1 = Some(10) | ||
value2 = Some(10) | ||
return Some(~value1 + ~value2) | ||
|
||
|
||
if __name__ == "__main__": | ||
print("Success so it return value: ", success_on_operation()) | ||
print("Fail so it return Empty: ", fail_on_operation()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
from .prelude import Option, Some, Empty, Result, Ok, Err | ||
from .exceptions import UnwrapException | ||
from .exceptions import UnwrapException, early_return |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,21 @@ | ||
from functools import wraps | ||
|
||
|
||
class UnwrapException(Exception): | ||
... | ||
|
||
|
||
class EarlyReturnException[T](ValueError): | ||
def __init__(self, value: T): | ||
self.value = value | ||
super().__init__(self.value) | ||
|
||
|
||
def early_return(f): | ||
@wraps(f) | ||
def wrapper(*args, **kwargs): | ||
try: | ||
f(*args, **kwargs) | ||
except EarlyReturnException as e: | ||
return e.value | ||
return wrapper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
from abc import abstractmethod | ||
from dataclasses import dataclass | ||
from typing import cast, TypeVar, Union, Callable, Generic, Iterator, Tuple, Dict, Any | ||
from rusty_results.exceptions import UnwrapException | ||
from rusty_results.exceptions import UnwrapException, EarlyReturnException | ||
|
||
try: | ||
from pydantic.fields import ModelField | ||
except ImportError: # pragma: no cover | ||
|
@@ -250,6 +251,15 @@ def transpose(self) -> "Result[Option[T], E]": | |
""" | ||
... # pragma: no cover | ||
|
||
@abstractmethod | ||
def early_return(self) -> T: | ||
""" | ||
Access hook for `early_return` wrapper style. | ||
:return: Self if self is Some(T) otherwise | ||
:raises: EarlyReturnException(Empty) | ||
""" | ||
... | ||
|
||
@abstractmethod | ||
def __bool__(self) -> bool: | ||
... # pragma: no cover | ||
|
@@ -260,6 +270,14 @@ def __contains__(self, item: T) -> bool: | |
def __iter__(self): | ||
return self.iter() | ||
|
||
def __invert__(self) -> T: | ||
""" | ||
Access hook for `early_return` wrapper style. | ||
:return: Self if self is Some(T) otherwise | ||
:raises: EarlyReturnException(Empty) | ||
""" | ||
return self.early_return() | ||
|
||
@classmethod | ||
def __get_validators__(cls): | ||
yield cls.__validate | ||
|
@@ -420,6 +438,10 @@ def transpose(self) -> "Result[Option[T], E]": | |
value: "ResultProtocol[T, E]" = self.Some | ||
return value.map(Some) | ||
|
||
def early_return(self) -> T: | ||
# it is safe to unwrap here as we know we are Some | ||
return self.unwrap() | ||
|
||
def __bool__(self) -> bool: | ||
return True | ||
|
||
|
@@ -504,6 +526,10 @@ def flatten(self) -> "Option[T]": | |
def transpose(self) -> "Result[Option[T], E]": | ||
return Ok(self) | ||
|
||
def early_return(self) -> T: | ||
# it is safe to unwrap here as we know we are some | ||
danielSanchezQ marked this conversation as resolved.
Show resolved
Hide resolved
|
||
raise EarlyReturnException(self) | ||
|
||
def __bool__(self) -> bool: | ||
return False | ||
|
||
|
@@ -726,6 +752,23 @@ def transpose(self) -> Option["Result[T, E]"]: | |
""" | ||
... # pragma: no cover | ||
|
||
@abstractmethod | ||
def early_return(self) -> T: | ||
""" | ||
Access hook for `early_return` wrapper style. | ||
:return: T if self is Ok(T) otherwise | ||
:raises: EarlyReturnException(Err(e)) | ||
""" | ||
... | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add pragma no cover |
||
|
||
def __invert__(self) -> T: | ||
""" | ||
Access hook for `early_return` wrapper style. | ||
:return: T if self is Ok(T) otherwise | ||
:raises: EarlyReturnException(Err(e)) | ||
""" | ||
return self.early_return() | ||
|
||
@abstractmethod | ||
def __bool__(self) -> bool: | ||
... # pragma: no cover | ||
|
@@ -898,6 +941,9 @@ def transpose(self) -> Option["Result[T, E]"]: | |
raise TypeError("Inner value is not of type Option") | ||
return cast(Option, self.unwrap()).map(Ok) | ||
|
||
def early_return(self) -> T: | ||
return self.unwrap() | ||
|
||
def __repr__(self): | ||
return f"Ok({self.Ok})" | ||
|
||
|
@@ -983,6 +1029,9 @@ def flatten(self) -> "Result[T, E]": | |
def transpose(self) -> Option["Result[T, E]"]: | ||
return Some(self) | ||
|
||
def early_return(self) -> T: | ||
raise EarlyReturnException(self) | ||
|
||
def __repr__(self): | ||
return f"Err({self.Error})" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add pragma no cover