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.

Sign up for GitHub

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

Jump to bottom

Fix UnboundLocalError when doing automated import with return_json=True #245

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Fix UnboundLocalError when doing automated import with return_json=True #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
968eaaf
Fix several `UnboundLocalError` exceptions when doing automated impor…
petschki Jul 5, 2024
c59bed8
changenote
petschki Jul 5, 2024
d9df27b
pin ijson for python 2
petschki Jul 5, 2024
1f61856
Merge branch 'main' into fix-unboundlocalerror
pbauer Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ Changelog

- Add and run a black version, that is compatible with Python 2.
[pgrunewald]

- Fix ``AtributeError: 'NamedImage' object has no attribute '_blob'`` similar to #236.
[petschki]

- Make zcml conditions more specific so that migration aliases don't trigger them
[reinhardt]

- Fix several ``UnboundLocalError`` exceptions when doing automated import
with ``return_json=True``
[petschki]

- Suppress events when importing ordering to not trigger ContainerModifiedEvent.
[pbauer]

Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
install_requires.append("jsonschema < 4")
install_requires.append("pathlib2")
install_requires.append("plone.api >= 1.8.4, < 2")

install_requires.append("ijson < 3.3.0")
# There is a py2-imcompatibility in plone.rest 3.0.1
install_requires.append("plone.rest < 3.0.1")
Expand Down
49 changes: 16 additions & 33 deletions src/collective/exportimport/import_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
logger.error(e)
status = "error"
msg = e
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
msg = self.do_import(data)
api.portal.show_message(msg, self.request)
Expand Down Expand Up @@ -194,10 +191,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
groups = self.import_groups(data["groups"])
members = self.import_members(data["members"])
Expand Down Expand Up @@ -385,10 +380,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
localroles = self.import_localroles(data)
msg = _(u"Imported {} localroles").format(localroles)
Expand Down Expand Up @@ -461,10 +454,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
start = datetime.now()
orders = self.import_ordering(data)
Expand Down Expand Up @@ -519,10 +510,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
u"Failure while uploading: {}".format(e),
request=self.request,
)
msg = u"Failure while uploading: {}".format(e)
api.portal.show_message(msg, request=self.request)
else:
defaultpages = self.import_default_pages(data)
msg = _(u"Changed {} default pages").format(defaultpages)
Expand Down Expand Up @@ -592,10 +581,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
results = self.import_data(data)
msg = _(u"Imported {} comments").format(results)
Expand Down Expand Up @@ -688,10 +675,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
portlets = self.import_portlets(data)
msg = _(u"Created {} portlets").format(portlets)
Expand Down Expand Up @@ -875,10 +860,8 @@ def __call__(self, jsonfile=None, return_json=False):
except Exception as e:
status = "error"
logger.error(e)
api.portal.show_message(
_(u"Failure while uploading: {}").format(e),
request=self.request,
)
msg = _(u"Failure while uploading: {}").format(e)
api.portal.show_message(msg, request=self.request)
else:
import_plone_redirects(data)
msg = _(u"Redirects imported")
Expand Down
Loading