Ticket #7518: imports.2.patch

trac/attachment.py

@@ -25 +25 @@
 
 from genshi.builder import tag
 
-from trac import perm, util
 from trac.config import BoolOption, IntOption
 from trac.core import *
 from trac.env import IEnvironmentSetupParticipant
 from trac.mimeview import *
-from trac.perm import PermissionError, PermissionSystem, IPermissionPolicy
+from trac.perm import IPermissionPolicy
 from trac.resource import *
 from trac.search import search_to_sql, shorten_result
-from trac.util import get_reporter_id, create_unique_file, content_disposition
+from trac.util import get_reporter_id, create_unique_file
 from trac.util.datefmt import to_timestamp, utc
-from trac.util.text import unicode_quote, unicode_unquote, pretty_size
+from trac.util.text import unicode_quote, unicode_unquote
 from trac.util.translation import _
 from trac.web import HTTPBadRequest, IRequestHandler
 from trac.web.chrome import add_link, add_stylesheet, add_ctxtnav, \

trac/env.py

@@ -25 +25 @@
 
 from trac import db_default
 from trac.config import *
-from trac.core import Component, ComponentManager, implements, Interface, \
-                      ExtensionPoint, TracError
+from trac.core import *
 from trac.db import DatabaseManager
 from trac.util import get_pkginfo
 from trac.util.translation import _

trac/prefs/api.py

@@ -13 +13 @@
 
 from trac.core import *
 
+__all__ = ['IPreferencePanelProvider']
 
+
 class IPreferencePanelProvider(Interface):
 
     def get_preference_panels(req):

trac/prefs/web_ui.py

@@ -14 +14 @@
 #
 # Author: Daniel Lundin <daniel@edgewall.com>
 
-from datetime import datetime
 import pkg_resources
 import re
 

trac/mimeview/rst.py

@@ -25 +25 @@
 __docformat__ = 'reStructuredText'
 
 from distutils.version import StrictVersion
-import re
 try:
     from docutils import nodes
     from docutils.core import publish_parts
@@ -39 +38 @@
 from trac.mimeview.api import IHTMLPreviewRenderer, content_to_unicode
 from trac.util.html import Element, Markup
 from trac.util.translation import _
-from trac.web.href import Href
 from trac.wiki.api import WikiSystem
 from trac.wiki.formatter import WikiProcessor, Formatter, extract_link
 

trac/mimeview/patch.py

@@ -24 +24 @@
 from trac.util.html import escape, Markup
 from trac.util.text import expandtabs
 from trac.util.translation import _
-from trac.web.chrome import Chrome, add_script, add_stylesheet
+from trac.web.chrome import add_script, add_stylesheet
 
 __all__ = ['PatchRenderer']
 

trac/mimeview/pygments.py

@@ -21 +21 @@
 from trac.config import ListOption, Option
 from trac.mimeview.api import IHTMLPreviewRenderer, Mimeview
 from trac.prefs import IPreferencePanelProvider
-from trac.util import get_module_path, get_pkginfo
+from trac.util import get_pkginfo
 from trac.util.datefmt import http_date, localtz
 from trac.web import IRequestHandler
 from trac.web.chrome import add_stylesheet

trac/mimeview/enscript.py

@@ -17 +17 @@
 
 from genshi.core import Markup
 
-from trac.config import Option, ListOption
-from trac.core import *
+from trac.config import *
+from trac.core import implements, Component
 from trac.mimeview.api import IHTMLPreviewRenderer, Mimeview
 from trac.util import NaivePopen
-from trac.util.html import escape, Deuglifier
+from trac.util.html import Deuglifier
 
 __all__ = ['EnscriptRenderer']
 

trac/mimeview/php.py

@@ -26 +26 @@
 from trac.mimeview.api import IHTMLPreviewRenderer, content_to_unicode
 from trac.util import NaivePopen
 from trac.util.html import Deuglifier
+from trac.util.translation import _
 
 __all__ = ['PHPRenderer']
 

trac/ticket/admin.py

@@ -21 +21 @@
 from trac.util.datefmt import utc, parse_date, get_date_format_hint, \
                               get_datetime_format_hint
 from trac.util.translation import _
-from trac.web.chrome import add_link, add_script
+from trac.web.chrome import add_script
 
 
 class TicketAdminPanel(Component):

trac/ticket/api.py

@@ -15 +15 @@
 # Author: Jonas Borgström <jonas@edgewall.com>
 
 import re
-from datetime import datetime
 
 from genshi.builder import tag
 
 from trac.config import *
 from trac.core import *
-from trac.perm import IPermissionRequestor, PermissionSystem, PermissionError
+from trac.perm import IPermissionRequestor, PermissionSystem
 from trac.resource import IResourceManager
 from trac.util import Ranges
 from trac.util.compat import set, sorted
-from trac.util.datefmt import utc
-from trac.util.text import shorten_line, obfuscate_email_address
+from trac.util.text import shorten_line
 from trac.util.translation import _
 from trac.wiki import IWikiSyntaxProvider, WikiParser
 

trac/ticket/web_ui.py

@@ -16 +16 @@
 
 import csv
 from datetime import datetime
-import os
 import pkg_resources
 import re
 from StringIO import StringIO
-import time
 
 from genshi.core import Markup
 from genshi.builder import tag
@@ -32 +30 @@
 from trac.resource import Resource, get_resource_url, \
                          render_resource_link, get_resource_shortname
 from trac.search import ISearchSource, search_to_sql, shorten_result
-from trac.ticket.api import TicketSystem, ITicketManipulator, \
-                            ITicketActionController
+from trac.ticket.api import TicketSystem, ITicketManipulator
 from trac.ticket.model import Milestone, Ticket
 from trac.ticket.notification import TicketNotifyEmail
 from trac.timeline.api import ITimelineEventProvider
 from trac.util import get_reporter_id, partition
 from trac.util.compat import any
 from trac.util.datefmt import to_timestamp, utc
-from trac.util.text import CRLF, shorten_line, obfuscate_email_address
+from trac.util.text import shorten_line, obfuscate_email_address
 from trac.util.presentation import separated
 from trac.util.translation import _, tag_, N_, gettext
 from trac.versioncontrol.diff import get_diff_options, diff_blocks

trac/ticket/model.py

@@ -18 +18 @@
 #         Christopher Lenz <cmlenz@gmx.de>
 
 import re
-import sys
-import time
 from datetime import date, datetime
 
 from trac.attachment import Attachment

trac/ticket/roadmap.py

@@ -17 +17 @@
 
 from datetime import datetime
 import re
-from time import localtime, strftime, time
+from time import time
 
 from genshi.builder import tag
 
@@ -33 +33 @@
 from trac.util.datefmt import parse_date, utc, to_timestamp, to_datetime, \
                               get_date_format_hint, get_datetime_format_hint, \
                               format_date, format_datetime
-from trac.util.text import shorten_line, CRLF, to_unicode
+from trac.util.text import shorten_line, CRLF
 from trac.util.translation import _
 from trac.ticket import Milestone, Ticket, TicketSystem
-from trac.ticket.query import Query
 from trac.timeline.api import ITimelineEventProvider
 from trac.web import IRequestHandler
-from trac.web.chrome import add_link, add_stylesheet, add_warning, \
+from trac.web.chrome import add_link, add_warning, \
                             INavigationContributor
 from trac.wiki.api import IWikiSyntaxProvider
 from trac.wiki.formatter import format_to_html
@@ -537 +536 @@
     # IRequestHandler methods
 
     def match_request(self, req):
-        import re, urllib
+        import re
         match = re.match(r'/milestone(?:/(.+))?', req.path_info)
         if match:
             if match.group(1):

trac/ticket/query.py

@@ -23 +23 @@
 
 from genshi.builder import tag
 
-from trac.config import Option, IntOption 
+from trac.config import Option, IntOption
 from trac.core import *
 from trac.db import get_column_names
 from trac.mimeview.api import Mimeview, IContentConverter, Context

trac/ticket/notification.py

@@ -16 +16 @@
 # Author: Daniel Lundin <daniel@edgewall.com>
 #
 
-from trac import __version__
 from trac.core import *
 from trac.config import *
 from trac.notification import NotifyEmail
 from trac.util import md5
 from trac.util.datefmt import to_timestamp
-from trac.util.text import CRLF, wrap, to_unicode
+from trac.util.text import CRLF, wrap
 
 from genshi.template.text import TextTemplate
 
+
 class TicketNotificationSystem(Component):
 
     always_notify_owner = BoolOption('notification', 'always_notify_owner',

trac/db/api.py

@@ -17 +17 @@
 import os
 import urllib
 
-from trac.config import Option, IntOption
-from trac.core import *
+from trac.config import *
+from trac.core import Interface, ExtensionPoint, Component, TracError
 from trac.db.pool import ConnectionPool
 from trac.util.text import unicode_passwd
 from trac.util.translation import _

trac/db/mysql_backend.py

@@ -28 +28 @@
     import MySQLdb
     import MySQLdb.cursors
     has_mysqldb = True
-    
+
     class MySQLUnicodeCursor(MySQLdb.cursors.Cursor):
         def _convert_row(self, row):
             return tuple([(isinstance(v, str) and [v.decode('utf-8')] or [v])[0]
@@ -197 +197 @@
 
     def cursor(self):
         return MySQLUnicodeCursor(self.cnx)
-        
- No newline at end of file

trac/versioncontrol/api.py

@@ -25 +25 @@
 from trac.config import Option
 from trac.core import *
 from trac.perm import PermissionError
-from trac.resource import IResourceManager, ResourceSystem, ResourceNotFound
+from trac.resource import IResourceManager, ResourceNotFound
 from trac.util.text import to_unicode
 from trac.util.translation import _
 from trac.web.api import IRequestFilter

trac/versioncontrol/svn_fs.py

@@ -40 +40 @@
 """
 
 import os.path
-import time
 import weakref
 import posixpath
 from datetime import datetime

trac/admin/api.py

@@ -13 +13 @@
 
 from trac.core import *
 
+__all__ = ['IAdminPanelProvider']
 
+
 class IAdminPanelProvider(Interface):
     """Extension point interface for adding panels to the web-based
     administration interface.

trac/admin/web_ui.py

@@ -33 +33 @@
 from trac.util.text import to_unicode
 from trac.util.translation import _
 from trac.web import HTTPNotFound, IRequestHandler
-from trac.web.chrome import add_script, add_stylesheet, add_warning, Chrome, \
-                            INavigationContributor, ITemplateProvider
+from trac.web.chrome import add_stylesheet, add_warning, ITemplateProvider, \
+                            INavigationContributor
 
 try:
     from webadmin import IAdminPageProvider

trac/admin/console.py

@@ -24 +24 @@
 import sys
 import time
 import traceback
-import urllib
 
 from trac import __version__ as VERSION
-from trac import perm, util, db_default
-from trac.core import TracError
+from trac import perm
+from trac.core import TracError, Component
 from trac.env import Environment
 from trac.perm import PermissionSystem
 from trac.ticket.model import *

trac/loader.py

@@ -22 +22 @@
 import os
 import sys
 
-from trac.util.compat import set
 
 __all__ = ['load_components']
 

trac/wiki/api.py

@@ -21 +21 @@
 except ImportError:
     import dummy_threading as threading
 import time
-import urllib
 import re
-from StringIO import StringIO
 
 from genshi.builder import tag
 
 from trac.config import BoolOption
 from trac.core import *
 from trac.resource import IResourceManager
-from trac.util import reversed
-from trac.util.html import html
 from trac.util.translation import _
 from trac.wiki.parser import WikiParser
 
@@ -256 +252 @@
         return page
 
     def get_wiki_syntax(self):
-        from trac.wiki.formatter import Formatter
         lower = r'(?<![A-Z0-9_])' # No Upper case when looking behind
         upper = r'(?<![a-z0-9_])' # No Lower case when looking behind
         wiki_page_name = (

trac/wiki/web_ui.py

@@ -20 +20 @@
 import pkg_resources
 import re
 
-from genshi.core import Markup
 from genshi.builder import tag
 
 from trac.attachment import AttachmentModule

trac/wiki/model.py

@@ -16 +16 @@
 # Author: Jonas Borgström <jonas@edgewall.com>
 #         Christopher Lenz <cmlenz@gmx.de>
 
-import time
 from datetime import datetime
 
 from trac.core import *

trac/wiki/formatter.py

@@ -20 +20 @@
 
 import re
 import os
-import urllib
 
 from StringIO import StringIO
 
@@ -30 +29 @@
 from genshi.input import HTMLParser, ParseError
 from genshi.util import plaintext
 
-from trac.core import *
 from trac.mimeview import *
 from trac.resource import get_relative_url
 from trac.util.compat import set

trac/wiki/macros.py

@@ -15 +15 @@
 # Author: Christopher Lenz <cmlenz@gmx.de>
 
 from datetime import datetime
-import imp
 import inspect
 import os
 import re
@@ -27 +26 @@
 from trac.core import *
 from trac.resource import Resource, get_resource_url, get_resource_summary
 from trac.util.datefmt import format_date, utc
-from trac.util.compat import sorted, groupby, any, set
+from trac.util.compat import sorted, groupby, set
 from trac.util.html import escape
 from trac.util.text import unquote, to_unicode
 from trac.util.translation import _
 from trac.wiki.api import IWikiMacroProvider, WikiSystem, parse_args
 from trac.wiki.formatter import format_to_html, format_to_oneliner, \
                                 extract_link, OutlineFormatter
-from trac.wiki.model import WikiPage
-from trac.web.chrome import add_stylesheet
 
 
 class WikiMacroBase(Component):

trac/wiki/interwiki.py

@@ -23 +23 @@
 from genshi.builder import tag
 
 from trac.core import *
-from trac.wiki.formatter import Formatter
 from trac.wiki.parser import WikiParser
 from trac.wiki.api import IWikiChangeListener, IWikiMacroProvider
 

trac/search/web_ui.py

@@ -16 +16 @@
 
 import pkg_resources
 import re
-import time
 
 from genshi.builder import tag, Element
 

trac/timeline/api.py

@@ -17 +17 @@
 # Author: Jonas Borgström <jonas@edgewall.com>
 #         Christopher Lenz <cmlenz@gmx.de>
 
-from urlparse import urljoin
-
 from trac.core import *
-from trac.resource import get_resource_url
-from trac.util.datefmt import to_timestamp
-from trac.web.href import Href
 
 
+__all__ = ['ITimelineEventProvider']
+
+
 class ITimelineEventProvider(Interface):
     """Extension point interface for adding sources for timed events to the
     timeline.

trac/timeline/web_ui.py

@@ -20 +20 @@
 from datetime import datetime, timedelta
 import pkg_resources
 import re
-import time
-from urlparse import urlparse
 
 from genshi.builder import tag
 
@@ -38 +36 @@
 from trac.web import IRequestHandler, IRequestFilter
 from trac.web.chrome import add_link, add_stylesheet, prevnext_nav, Chrome, \
                             INavigationContributor, ITemplateProvider
-                            
 from trac.wiki.api import IWikiSyntaxProvider
 
 

trac/web/_fcgi.py

@@ -805 +805 @@
         outrec = Record(FCGI_UNKNOWN_TYPE)
         outrec.contentData = struct.pack(FCGI_UnknownTypeBody, inrec.type)
         outrec.contentLength = FCGI_UnknownTypeBody_LEN
-        self.writeRecord(rec)
+        self.writeRecord(outrec)
         
 class MultiplexedConnection(Connection):
     """

trac/web/chrome.py

@@ -19 +19 @@
 import pkg_resources
 import pprint
 import re
-try: 
-    from cStringIO import StringIO as cStringIO 
-except ImportError: 
-    cStringIO = StringIO 
 
 try:
     from babel.support import Translations
@@ -34 +30 @@
     from genshi.filters import Translator
 else:
     Translator = None
-from genshi.input import HTML, ParseError
 from genshi.core import Attrs, START
 from genshi.output import DocType
 from genshi.template import TemplateLoader, MarkupTemplate, TextTemplate
@@ -46 +41 @@
 from trac.mimeview import get_mimetype, Context
 from trac.resource import *
 from trac.util import compat, get_reporter_id, presentation, get_pkginfo, \
-                      get_module_path, translation, arity
+                      translation
 from trac.util.compat import partial, set
 from trac.util.html import plaintext
 from trac.util.text import pretty_size, obfuscate_email_address, \

trac/web/main.py

@@ -40 +40 @@
 from trac.config import ExtensionOption, Option, OrderedExtensionsOption
 from trac.core import *
 from trac.env import open_environment
-from trac.perm import PermissionCache, PermissionError, PermissionSystem
+from trac.perm import PermissionCache, PermissionError
 from trac.resource import ResourceNotFound
 from trac.util import get_lines_from_file, get_last_traceback, hex_entropy, \
                       arity, translation