AIC fixes #450
Merged
AIC fixes #450
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
| @@ -144,7 +144,7 @@ def escapeForCommand(string): | |||
| # and is primarily used for arbitrary strings (e.g. filenames, paths) | |||
| # that might not be valid unicode to begin with. | |||
| def escape(string): | |||
| if isinstance(string, basestring): | |||
| if isinstance(string, str): | |||
There was a problem hiding this comment.
Should we use django.utils.six.binary_type instead?
There was a problem hiding this comment.
Neat, I didn't realize Django shipped with a copy of six! We've tried to keep from requiring Django in archivematicaCommon however, and when we do the Py3 conversion we'll probably just use six as a dependency instead of using Django's.
|
👍 |
Unicode strings cannot be decoded, so only try to run .decode on bytestrings.
An AIC does not have an objects directory, so put the DMDID on the SIP directory div instead.
Revert change to metadata dir from b7ebee6 In an AIC, the metadata dir is not inside the objects dir, and is added to the fileSec separately.
Remove empty directories anywhere in the AIP, not just in the objects directory.
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.
Fixes for bugs relating to #440 and deleting empty directories.
And other minor fixes
strnotunicodestrings. Fixes displaying unicode in the task detail view