From 89dcc4c7c2ed199eeb1f7074b9980faf9cc31aca Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 13 2016 09:19:45 +0000 Subject: [PATCH 1/2] Let's not render our custom markdown if we are outside of a flask request This will only impact comments showed via SSE, on reload they will show fine again. --- diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index 6f25464..e960454 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -96,8 +96,11 @@ class ImplicitIssuePattern(markdown.inlinepatterns.Pattern): idx = markdown.util.AtomicString(m.group(2)) text = ' #%s' % idx - root = flask.request.url_root - url = flask.request.url + root = pagure.APP.config['APP_URL'] + try: + url = flask.request.url + except RuntimeError: + return text repo = user = None if flask.request.args.get('user'): @@ -106,7 +109,7 @@ class ImplicitIssuePattern(markdown.inlinepatterns.Pattern): repo = flask.request.args.get('repo') if not user and not repo: - if 'fork/' in flask.request.url: + if 'fork/' in url: user, repo = url.split('fork/')[1].split('/', 2)[:2] else: repo = url.split(root)[1].split('/', 1)[0] @@ -130,8 +133,11 @@ class ImplicitPRPattern(markdown.inlinepatterns.Pattern): idx = markdown.util.AtomicString(m.group(2)) text = ' PR#%s' % idx - root = flask.request.url_root - url = flask.request.url + root = pagure.APP.config['APP_URL'] + try: + url = flask.request.url + except RuntimeError: + return text repo = user = None if flask.request.args.get('user'): @@ -140,7 +146,7 @@ class ImplicitPRPattern(markdown.inlinepatterns.Pattern): repo = flask.request.args.get('repo') if not user and not repo: - if 'fork/' in flask.request.url: + if 'fork/' in url: user, repo = url.split('fork/')[1].split('/', 2)[:2] else: repo = url.split(root)[1].split('/', 1)[0] From a9d79384ed15b3801ab639e05d18c0ec6838d77e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 13 2016 09:22:11 +0000 Subject: [PATCH 2/2] Be consistent about our source of info --- diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index e960454..3a90113 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -96,8 +96,8 @@ class ImplicitIssuePattern(markdown.inlinepatterns.Pattern): idx = markdown.util.AtomicString(m.group(2)) text = ' #%s' % idx - root = pagure.APP.config['APP_URL'] try: + root = flask.request.url_root url = flask.request.url except RuntimeError: return text @@ -133,8 +133,8 @@ class ImplicitPRPattern(markdown.inlinepatterns.Pattern): idx = markdown.util.AtomicString(m.group(2)) text = ' PR#%s' % idx - root = pagure.APP.config['APP_URL'] try: + root = flask.request.url_root url = flask.request.url except RuntimeError: return text