[gentoo-commits] packages:master commit in: web/lib/

[gentoo-commits] packages:master commit in: web/lib/

[Alec Warner]

commit:     2779d06e6ac4ebf019080f934355fc94c5d59c48
Author:     Alec Warner <antarus <AT> scriptkitty <DOT> com>
AuthorDate: Sun Dec 30 09:07:17 2012 +0000
Commit:     Alec Warner <antarus <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 09:08:45 2012 +0000
URL:        http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=2779d06e

Change to GMT to meet RFC requirements and fix bug 430350

---
 web/lib/headers.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/headers.py b/web/lib/headers.py
index 5f7986a..8a5a389 100644
--- a/web/lib/headers.py
+++ b/web/lib/headers.py
@@ -12,7 +12,7 @@ def lastmodified_rightcontent(latest_entry):
 
 def lastmodified_httpheader(latest_entry):
     """return a HTTP Last-Modified value of the latest entry"""
-    fmt = '%a, %d %b %Y %H:%M:%S UTC'
+    fmt = '%a, %d %b %Y %H:%M:%S GMT'
     return _lastmodified_strftime(fmt, latest_entry)
 
 def lastmodified_rss(latest_entry):
@@ -33,6 +33,6 @@ def pageexpire_timestamp():
 
 def httpheader_expires():
     expire_ts = pageexpire_timestamp()
-    return strftime('%a, %d %b %Y %H:%M:%S UTC', gmtime(expire_ts))
+    return strftime('%a, %d %b %Y %H:%M:%S GMT', gmtime(expire_ts))
 
 # vim:ts=4 et ft=python:

[gentoo-commits] packages:master commit in: web/lib/

[Matt Thode]

commit:     593331adad736e4293ec40e6dbee7f921e3b08e1
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Apr  3 16:07:36 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 16:07:36 2015 +0000
URL:        https://gitweb.gentoo.org/packages.git/commit/?id=593331ad

fix for newer cherrypy (3.3.0)

 web/lib/changelog_formatter.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py
index 536b0b0..cc67003 100644
--- a/web/lib/changelog_formatter.py
+++ b/web/lib/changelog_formatter.py
@@ -1,6 +1,6 @@
 import re
 import urlparse
-from cherrypy.lib.tidy import html_break
+import cgi
 
 from web.lib.links import viewcvs_link, \
                           bugzilla_bug_link, \
@@ -9,6 +9,10 @@ from web.lib.links import viewcvs_link, \
 # We use short variable names!
 # pylint: disable-msg=C0103
 
+def html_break(value):
+    """New cherrypy doesn't have tidy.html_break anymore"""
+    return cgi.escape(value).replace('\n', '<br />')
+
 re_author = re.compile(r' 20[01]\d; ([^<]+)? *<([^@> ]+)@[^>]')
 re_author2 = re.compile(r' <?([^<@ ]+)@')
 def extract_changelog_entry_author(line):

[gentoo-commits] packages:master commit in: web/lib/

[Alec Warner]

commit:     03dd7f592879ead302d3b12ff91b4ea3ef95ce53
Author:     Alec Warner <antarus <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 19:28:25 2012 +0000
Commit:     Alec Warner <antarus <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 19:28:25 2012 +0000
URL:        http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=03dd7f59

Don't prefix urls with a scheme if they already have a scheme.

---
 web/lib/changelog_formatter.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py
index 35dc5d7..536b0b0 100644
--- a/web/lib/changelog_formatter.py
+++ b/web/lib/changelog_formatter.py
@@ -1,4 +1,5 @@
 import re
+import urlparse
 from cherrypy.lib.tidy import html_break
 
 from web.lib.links import viewcvs_link, \
@@ -160,7 +161,12 @@ def _pretty_changelog_pass6(changelog):
     """Convert any URL markup to real links"""
 
     def markup(m):
-        url = 'http://'+m.group(1)
+        group = m.group(1)
+        url = urlparse.urlparse(group)
+        if not url.scheme:
+            url = 'http://' + m.group(1)
+        else:
+            url = group
         return '<a href="%s">%s</a>' % (url, url)
     changelog = _single_pass_re_loop(re_m_url, markup, changelog)
     return changelog

[gentoo-commits] packages:master commit in: web/lib/

[Robin H. Johnson]

commit:     09894873b358904e4639eaf11f84cf6011de5030
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 23:50:09 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 23:50:09 2012 +0000
URL:        http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=09894873

Handle URLs wrapped with quotes in changelog messages. The quotes are not part of the URL.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 web/lib/changelog_formatter.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py
index 76a6661..35dc5d7 100644
--- a/web/lib/changelog_formatter.py
+++ b/web/lib/changelog_formatter.py
@@ -47,8 +47,8 @@ re_email2 = re.compile(r'([^@ ]+)@gentoo.org')
 re_file = re.compile(r'([\+-]?)(\S+)([:,]|[:,]$)')
 re_bugid = re.compile(r'([Bb][uU][gG]\s+?#?)(\d+)')
 re_url_base = '(https?://[^\s/)>]+(?:/[\S]+)?)'
-re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)]+?.?|$)?")
-re_url_notend = re.compile(r'[\s.)>]+$')
+re_url = re.compile("([\s<(]*)"+re_url_base+"([\s>)\"']+?.?|$)?")
+re_url_notend = re.compile(r'[\s.)>\'"]+$')
 def _pretty_changelog_pass1(cat, pn, changelog):
     """Changelog prettification, pass1: replace text with markers"""
 

[gentoo-commits] packages:master commit in: web/lib/

[Christian Ruppert]

commit:     b06cfc09fc8afc2670cde58a8f4d597c7c93f6a5
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 15:45:37 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 15:45:37 2011 +0000
URL:        http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=b06cfc09

Fix bugzilla statuses

---
 web/lib/links.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web/lib/links.py b/web/lib/links.py
index 1dde044..6fbedd9 100644
--- a/web/lib/links.py
+++ b/web/lib/links.py
@@ -48,7 +48,7 @@ def bugzilla_search_link(searchstring,
     """Give a quicksearch link for a Bugzilla install"""
 
     if bug_status is None:
-        bug_status = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
+        bug_status = ['UNCONFIRMED', 'IN_PROGRESS', 'CONFIRMED']
 
     def f(k):
         """return a bug status match"""