diff options
| -rw-r--r-- | docs/news.txt | 7 | ||||
| -rw-r--r-- | paste/exceptions/reporter.py | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/news.txt b/docs/news.txt index f72e93c..7371e00 100644 --- a/docs/news.txt +++ b/docs/news.txt @@ -3,6 +3,13 @@ News .. contents:: +svn trunk +--------- + +* Make the import of ``socket.sslerror`` conditional in + ``paste.exceptions.reporter`` (needed for Python interpreters + compiled without SSL support). + 1.5.1 ----- diff --git a/paste/exceptions/reporter.py b/paste/exceptions/reporter.py index 354364a..4f020c7 100644 --- a/paste/exceptions/reporter.py +++ b/paste/exceptions/reporter.py @@ -5,7 +5,10 @@ from email.MIMEText import MIMEText from email.MIMEMultipart import MIMEMultipart import smtplib import time -from socket import sslerror +try: + from socket import sslerror +except ImportError: + sslerror = None from paste.exceptions import formatter class Reporter(object): |