|
a/Allura/allura/lib/helpers.py |
|
b/Allura/allura/lib/helpers.py |
|
... |
|
... |
| 361 |
return value.isoformat()
|
361 |
return value.isoformat()
|
| 362 |
|
362 |
|
| 363 |
def absurl(url):
|
363 |
def absurl(url):
|
| 364 |
if url is None: return None
|
364 |
if url is None: return None
|
| 365 |
if '://' in url: return url
|
365 |
if '://' in url: return url
|
|
|
366 |
# some __json__ methods call absurl
|
|
|
367 |
# and in tests request is not set so exception raises
|
|
|
368 |
# this check prevents it
|
|
|
369 |
try:
|
| 366 |
return request.scheme + '://' + request.host + url
|
370 |
host = request.scheme + '://' + request.host
|
|
|
371 |
except TypeError:
|
|
|
372 |
host = ''
|
|
|
373 |
return host + url
|
| 367 |
|
374 |
|
| 368 |
def diff_text(t1, t2, differ=None):
|
375 |
def diff_text(t1, t2, differ=None):
|
| 369 |
t1_lines = t1.replace('\r', '').split('\n')
|
376 |
t1_lines = t1.replace('\r', '').split('\n')
|
| 370 |
t2_lines = t2.replace('\r', '').split('\n')
|
377 |
t2_lines = t2.replace('\r', '').split('\n')
|
| 371 |
t1_words = []
|
378 |
t1_words = []
|