Fix regressions from merges and unit test updates.

Review Request #12144 — Created March 14, 2022 and submitted

Information

Review Board
release-5.0.x

Reviewers

Recent changes merged from Review Board 4 introduced usage of six to
modules that no longer used it. These have been switched to use
equivalent code for Python 3, and to fix some bad documentation that was
missed during development and review.

A recent unit test update for 5.0 was also broken. A raise was being
called in the else clause of a try/execpt, which isn't valid
(there's nothing to raise). This has been removed. Any exceptions will
just bubble up.

All unit tests pass (except for one that requires a larger update).

Summary ID
Fix regressions from merges and unit test updates.
Recent changes merged from Review Board 4 introduced usage of `six` to modules that no longer used it. These have been switched to use equivalent code for Python 3, and to fix some bad documentation that was missed during development and review. A recent unit test update for 5.0 was also broken. A `raise` was being called in the `else` clause of a `try/execpt`, which isn't valid (there's nothing to raise). This has been removed. Any exceptions will just bubble up.
073b4b2e83044327260cfa9cb7ec87976a4439c2
david
  1. Ship It!
  2. 
      
chipx86
Review request changed
Status:
Completed
Change Summary:
Pushed to release-5.0.x (ffdbc3b)