|
a/Allura/allura/lib/helpers.py |
|
b/Allura/allura/lib/helpers.py |
|
... |
|
... |
| 942 |
if retries and (isinstance(e, socket.timeout) or
|
942 |
if retries and (isinstance(e, socket.timeout) or
|
| 943 |
e.code in codes):
|
943 |
e.code in codes):
|
| 944 |
retries -= 1
|
944 |
retries -= 1
|
| 945 |
continue
|
945 |
continue
|
| 946 |
else:
|
946 |
else:
|
|
|
947 |
try:
|
|
|
948 |
url_string = url.get_full_url() # if url is Request obj
|
|
|
949 |
except Exception:
|
|
|
950 |
url_string = url
|
| 947 |
log.exception('Failed after %s retries: %s', retries, e)
|
951 |
log.exception('Failed after %s retries on url: %s: %s', retries, url_string, e)
|
| 948 |
raise
|
952 |
raise e
|
| 949 |
|
953 |
|
| 950 |
|
954 |
|
| 951 |
def plain2markdown(text, preserve_multiple_spaces=False, has_html_entities=False):
|
955 |
def plain2markdown(text, preserve_multiple_spaces=False, has_html_entities=False):
|
| 952 |
if not has_html_entities:
|
956 |
if not has_html_entities:
|
| 953 |
# prevent &foo; and { from becoming HTML entities
|
957 |
# prevent &foo; and { from becoming HTML entities
|