Error Migration and Refactoring for 3.6.0 #549
Merged
Conversation
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
Sometimes an exception may not be so clear cut, so let's allow an optional message to return
In this commit, we do the following: - Convert more functions to use MCprepError - Remove Blender Internal and 2.7X specific code
This refactors the following functions to use the new error type: - bAppendLink - open_program In addition, the function bAppendLink has had all 2.7X related code removed, although an argument related to 2.7X layers is kept to avoid widescale breakage
This file is not used at all, and is poorly written. If we need to revisit this idea, we can use Vivy as reference
TheDuckCow
reviewed
Mar 26, 2024
Comment on lines
229
to
236
| def bv28() -> bool: | ||
| """Check if blender 2.8, for layouts, UI, and properties. """ | ||
| """ | ||
| Check if blender 2.8, for layouts, UI, and properties. | ||
|
|
||
| Deprecated in MCprep 3.5, but kept to avoid breakage for now... | ||
| """ | ||
| env.deprecation_warning() | ||
| return min_bv((2, 80)) |
There was a problem hiding this comment.
All of these references have been removed now. If not on this 3.6.0 branch, then check in dev (maybe merging dev into the milestone branch), in which case either way I think this function can just be removed.
|
I think we should merge this into the CommonMCOBJ branch so we can knock out 2 birds with one stone |
|
Alright, merging into the CommonMCOBJ branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is mainly to migrate errors in MCprep to use the new
MCprepErrorclass. At some point, we realized the need for being able to return objects with messages, so we also added an optionalmsgfield toMCprepError.In this PR, we also perform any general refactoring that may crop up as needed. Most of these are related to error handling, but there are a few that for the sake of getting out of the way I've done, which are:
world_tools.pybAppendLink, as well as deprecate theactive_layerargumentThe following functions have been refactored to use the new error type:
convert_mtl:Optional[bool]->Optional[MCprepError]enable_obj_importer:Optional[Bool]->Union[OBJImportCode, MCprepError]bAppendLink:bool->Optional[MCprepError]open_program:Union[int, str]->Optional[MCprepError]