Skip to content

Commit

Permalink
Fix potential race condition in App.version_txt (Issue 999) (#1000)
Browse files Browse the repository at this point in the history
  • Loading branch information
d-maurer committed Jan 6, 2022
1 parent 900a62c commit c8a053b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
4.6.4 (unreleased)
------------------

- Fix potential race condition in ``App.version_txt.getZopeVersion``
(`#999 <https://github.com/zopefoundation/Zope/issues/985>`_)

- Reinstate simple sessioning with ``Products.TemporaryFolder``
because the underlying issues with ``tempstorage`` have been fixed.
(`#985 <https://github.com/zopefoundation/Zope/issues/985>`_)
Expand Down
2 changes: 1 addition & 1 deletion src/App/version_txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

def _prep_version_data():
global _version_string, _zope_version
if _version_string is None:
if _zope_version is None:
v = sys.version_info
pyver = "python %d.%d.%d, %s" % (v[0], v[1], v[2], sys.platform)
dist = pkg_resources.get_distribution('Zope')
Expand Down

0 comments on commit c8a053b

Please sign in to comment.