Mercurial > p > roundup > code
comparison roundup/cgi/client.py @ 5429:daa19de102a2
Python 3 preparation: make fallback SysCallError an actual exception class.
The code defines a fallback version of SysCallError when import of
OpenSSL.SSL. But in Python 3, defining it as None and then using in
"except" statements results in:
TypeError: catching classes that do not inherit from BaseException is
not allowed
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 09:56:22 +0000 |
| parents | a0ed8d5d744f |
| children | 407c75df2851 |
comparison
equal
deleted
inserted
replaced
| 5428:1f1899658115 | 5429:daa19de102a2 |
|---|---|
| 21 logger.warning("**SystemRandom not available. Using poor random generator") | 21 logger.warning("**SystemRandom not available. Using poor random generator") |
| 22 | 22 |
| 23 try: | 23 try: |
| 24 from OpenSSL.SSL import SysCallError | 24 from OpenSSL.SSL import SysCallError |
| 25 except ImportError: | 25 except ImportError: |
| 26 SysCallError = None | 26 class SysCallError(Exception): |
| 27 pass | |
| 27 | 28 |
| 28 from roundup import roundupdb, date, hyperdb, password | 29 from roundup import roundupdb, date, hyperdb, password |
| 29 from roundup.cgi import templating, cgitb, TranslationService | 30 from roundup.cgi import templating, cgitb, TranslationService |
| 30 from roundup.cgi import actions | 31 from roundup.cgi import actions |
| 31 from roundup.exceptions import LoginError, Reject, RejectRaw, \ | 32 from roundup.exceptions import LoginError, Reject, RejectRaw, \ |