The following commit has been merged in the master branch: commit e5b2feb75d166c255761bd1701341bb651b92731 Author: Ole Streicher <oleb...@debian.org> Date: Fri Mar 11 21:31:04 2016 +0100
Minor cleanup: unused imports and comments etc. diff --git a/webtools/blendslanguages.py b/webtools/blendslanguages.py index 6d33728..914812c 100644 --- a/webtools/blendslanguages.py +++ b/webtools/blendslanguages.py @@ -1,6 +1,7 @@ -'''Define languages which are supported in web sentinel pages''' -# Copyright 2010: Andreas Tille <ti...@debian.org> -# License: GPL +'''Define languages which are supported in web sentinel pages +Copyright 2010: Andreas Tille <ti...@debian.org> +License: GPL +''' from genshi import Markup diff --git a/webtools/blendsmarkdown.py b/webtools/blendsmarkdown.py index d3c5b7c..7d0cc3a 100644 --- a/webtools/blendsmarkdown.py +++ b/webtools/blendsmarkdown.py @@ -1,7 +1,8 @@ '''To enable better formatting of long descriptions we use Markdown -and some preprocessing of the RFC822 formatted descriptions''' -# Copyright 2008: Andreas Tille <ti...@debian.org> -# License: GPL +and some preprocessing of the RFC822 formatted descriptions +Copyright 2008: Andreas Tille <ti...@debian.org> +License: GPL +''' import re from sys import stderr diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py index 00d06dd..0a098bf 100644 --- a/webtools/blendstasktools.py +++ b/webtools/blendstasktools.py @@ -27,9 +27,6 @@ import psycopg2 import gettext from genshi import Markup -# According to http://genshi.edgewall.org/wiki/GenshiFaq#HowcanIincludeliteralXMLintemplateoutput -# there are different options to prevent escaping '<' / '>' but HTML does not work ... -# from genshi.input import HTML from blendsmarkdown import SplitDescription, MarkupString, render_longdesc try: diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py index 4f37804..25dd678 100644 --- a/webtools/blendstasktools_udd.py +++ b/webtools/blendstasktools_udd.py @@ -13,23 +13,16 @@ License: GPL ''' from sys import stderr, exit -from subprocess import Popen, PIPE import codecs import os import grp import stat -import gzip -import bz2 import re import email.utils import psycopg2 -import gettext from genshi import Markup -# According to http://genshi.edgewall.org/wiki/GenshiFaq#HowcanIincludeliteralXMLintemplateoutput -# there are different options to prevent escaping '<' / '>' but HTML does not work ... -# from genshi.input import HTML from blendsmarkdown import SplitDescription, MarkupString, render_longdesc try: diff --git a/webtools/bugs.py b/webtools/bugs.py index 6d6cc10..c4413e5 100755 --- a/webtools/bugs.py +++ b/webtools/bugs.py @@ -10,13 +10,12 @@ import json import re import time from datetime import datetime -from email.Utils import formatdate -import email.Utils +from email.utils import formatdate +import email.utils import gettext from genshi.template import TemplateLoader from genshi import Markup -from genshi.template.eval import UndefinedError from blendstasktools import ReadConfig, RowDictionaries, CheckOrCreateOutputDir, SetFilePermissions from blendsmarkdown import MarkupString @@ -235,7 +234,7 @@ def main(): sources['source'] = pkg['source'] sources['homepage'] = pkg['homepage'] sources['vcs_browser'] = pkg['vcs_browser'] - (_name, _url) = email.Utils.parseaddr(pkg['maintainer']) + (_name, _url) = email.utils.parseaddr(pkg['maintainer']) sources['maintainer_email'] = _url sources['maintainer_name'] = _name sources['maintainer'] = MarkupString('<a href="mailto:%s">%s</a>' % (_url, _name), pkg['source'], 'maintainer') @@ -263,7 +262,7 @@ def main(): sources['source'] = pkg['source'] sources['homepage'] = pkg['homepage'] sources['vcs_browser'] = pkg['vcs_browser'] - (_name, _url) = email.Utils.parseaddr(pkg['maintainer']) + (_name, _url) = email.utils.parseaddr(pkg['maintainer']) sources['maintainer_email'] = _url sources['maintainer_name'] = _name sources['maintainer'] = MarkupString('<a href="mailto:%s">%s</a>' % (_url, _name), pkg['source'], 'maintainer') diff --git a/webtools/tasks.py b/webtools/tasks.py index 61abbe5..3ae86f4 100755 --- a/webtools/tasks.py +++ b/webtools/tasks.py @@ -13,7 +13,6 @@ from email.utils import formatdate from genshi.template import TemplateLoader from genshi import Markup -from genshi.template.eval import UndefinedError from blendstasktools import Tasks, GetDependencies2Use, pkgstatus, pkgstatus_sortedkeys, UnlockBlendsTools, CheckOrCreateOutputDir, SetFilePermissions from blendslanguages import languages, language_dict diff --git a/webtools/tasks_udd.py b/webtools/tasks_udd.py index d10881d..4fef57e 100755 --- a/webtools/tasks_udd.py +++ b/webtools/tasks_udd.py @@ -13,7 +13,6 @@ from email.utils import formatdate from genshi.template import TemplateLoader from genshi import Markup -from genshi.template.eval import UndefinedError from blendstasktools_udd import Tasks, GetDependencies2Use, pkgstatus, pkgstatus_sortedkeys, UnlockBlendsTools, CheckOrCreateOutputDir, SetFilePermissions from blendslanguages import languages, language_dict -- Static and dynamic websites for Debian Pure Blends _______________________________________________ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit