Various fixes #35
Merged
Various fixes #35
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
…l is not installed. The distribution may have a `translations.json` with only an empty string. That should not break like this: ``` Traceback (innermost last): Module ZPublisher.WSGIPublisher, line 181, in transaction_pubevents Module ZPublisher.WSGIPublisher, line 391, in publish_module Module ZPublisher.WSGIPublisher, line 285, in publish Module ZPublisher.mapply, line 98, in mapply Module ZPublisher.WSGIPublisher, line 68, in call_object Module plone.rest.service, line 21, in __call__ Module plone.restapi.services, line 19, in render Module plone.distribution.services.sites.add, line 49, in reply Module plone.distribution.api.site, line 165, in create Module plone.distribution.api.site, line 104, in _create_site Module plone.distribution.handler, line 44, in default_handler Module plone.exportimport.importers, line 57, in import_site Module plone.exportimport.importers.base, line 70, in import_data Module plone.exportimport.importers.translations, line 17, in do_import TypeError: object of type 'NoneType' has no len() ```
…onally.
Only register them when `plone.app.multilingual` and `plone.app.discussion` are installed.
Prevent error when an exporter does not actually export any paths, but returns None, like before I made these two conditional:
```
$ bin/export-distribution parts/zeoclient-classic/etc/zope.conf Plone
Exporting Plone site at /Plone
Target path: /Users/maurits/community/plone-coredev/6.1/src/plone.classicui/src/plone/classicui/distributions/classic/content
Traceback (most recent call last):
File "/Users/maurits/community/plone-coredev/6.1/bin/export-distribution", line 250, in <module>
sys.exit(plone.distribution.cli.export())
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/maurits/community/plone-coredev/6.1/src/plone.distribution/src/plone/distribution/cli/__init__.py", line 44, in export
results = get_exporter(site).export_site(path)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/maurits/community/plone-coredev/6.1/src/plone.exportimport/src/plone/exportimport/exporters/__init__.py", line 72, in export_site
paths.extend(exporter.export_data(path))
TypeError: 'NoneType' object is not iterable
```
Set it to neutral None, unless it is explicitly set.
`json.dump` does not add this, so we explicitly do it. Otherwise when you manually edit a file and you use an editor that respects the standard `.editorconfig` that we have in most Plone packages, you always get a diff because there is a newline at the end.
We now have some data with a blacklist_status, and this gave an error.
|
I do not think it is too late to fix the naming in portlets |
ericof
approved these changes
Sep 12, 2024
davisagli
approved these changes
Sep 12, 2024
There was a problem hiding this comment.
Thanks, helpful improvements.
BTW, is it too late in the portlets.json to rename blacklist_status to something like disallowlist_status? I don't feel strongly about this, but using "black" in this context is frowned upon. For backwards compatibility we could still read the old name as well.
I support this.
We still read the old key for backwards compatibility.
|
In portlets I have deprecated And I added six news snippets. :-) |
davisagli
reviewed
Sep 12, 2024
davisagli
approved these changes
Sep 12, 2024
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.
I was testing plone/plone.classicui#13 and this led to some improvements. See individual commit messages for details, but largely it is this:
plone.app.multilingualis not available. I got an error initially.plone.app.discussionis not available.allow_discussionkey: this should only contain True or False when this is explicitly set on the object..editorconfigsettings that we have in most Plone packages.I have used this code to import and export a Classic UI site with the mentioned
plone.classicuipull request, and have updated it.BTW, is it too late in the
portlets.jsonto renameblacklist_statusto something likedisallowlist_status? I don't feel strongly about this, but using "black" in this context is frowned upon. For backwards compatibility we could still read the old name as well.