Drop support for Python 2.3.

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@7457 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jruigrok

Diff for: sample-plugins/permissions/authz_policy.py

@@ -119,11 +119,11 @@
 
 """
 
+from itertools import groupby
 import os
 from fnmatch import fnmatch
 from trac.core import *
 from trac.config import Option
-from trac.util.compat import set, groupby
 from trac.perm import PermissionSystem, IPermissionPolicy
 from configobj import ConfigObj
 

Diff for: sample-plugins/workflow/CodeReview.py

@@ -5,7 +5,6 @@
 from trac.ticket.default_workflow import ConfigurableTicketWorkflow
 from trac.perm import IPermissionRequestor
 from trac.config import Option, ListOption
-from trac.util.compat import set
 
 revision = "$Rev$"
 url = "$URL$"

Diff for: trac/config.py

@@ -16,7 +16,6 @@
 import os
 
 from trac.core import ExtensionPoint, TracError
-from trac.util.compat import set, sorted
 from trac.util.text import to_unicode, CRLF
 
 __all__ = ['Configuration', 'Option', 'BoolOption', 'IntOption', 'ListOption',

Diff for: trac/loader.py

@@ -22,8 +22,6 @@
 import os
 import sys
 
-from trac.util.compat import set
-
 __all__ = ['load_components']
 
 def _enable_plugin(env, module):

Diff for: trac/mimeview/api.py

@@ -67,7 +67,7 @@
 from trac.config import IntOption, ListOption, Option
 from trac.core import *
 from trac.resource import Resource
-from trac.util import reversed, sorted, Ranges
+from trac.util import Ranges
 from trac.util.text import to_utf8, to_unicode
 from trac.util.translation import _
 

Diff for: trac/perm.py

@@ -22,7 +22,6 @@
 from trac.config import ExtensionOption, OrderedExtensionsOption
 from trac.core import *
 from trac.resource import Resource, get_resource_name
-from trac.util.compat import set
 from trac.util.translation import _
 
 __all__ = ['IPermissionRequestor', 'IPermissionStore',

Diff for: trac/prefs/web_ui.py

@@ -27,7 +27,6 @@
 
 from trac.core import *
 from trac.prefs.api import IPreferencePanelProvider
-from trac.util.compat import sorted
 from trac.util.datefmt import all_timezones, get_timezone, localtz
 from trac.util.translation import _, get_available_locales
 from trac.web import HTTPNotFound, IRequestHandler

Diff for: trac/resource.py

@@ -17,7 +17,6 @@
 #         Alec Thomas <[email protected]>
 
 from trac.core import *
-from trac.util.compat import reversed
 from trac.util.translation import _
 
 

Diff for: trac/tests/functional/__init__.py

@@ -76,7 +76,6 @@
 
 from trac.tests.contentgen import random_sentence, random_page, random_word, \
     random_unique_camel
-from trac.util.compat import sorted, reversed
 from trac.test import TestSetup, TestCaseSetup
 
 internal_error = 'Trac detected an internal error:'

Diff for: trac/tests/perm.py

@@ -1,7 +1,6 @@
 from trac import perm
 from trac.core import *
 from trac.test import EnvironmentStub
-from trac.util.compat import sorted, set
 
 import unittest
 

Diff for: trac/ticket/api.py

@@ -24,7 +24,6 @@
 from trac.perm import IPermissionRequestor, PermissionSystem, PermissionError
 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.translation import _

Diff for: trac/ticket/default_workflow.py

@@ -25,7 +25,6 @@
 from trac.env import IEnvironmentSetupParticipant
 from trac.config import Configuration
 from trac.ticket.api import ITicketActionController, TicketSystem
-from trac.util.compat import set
 from trac.util.translation import _
 
 # -- Utilities for the ConfigurableTicketWorkflow

Diff for: trac/ticket/model.py

@@ -26,7 +26,7 @@
 from trac.core import TracError
 from trac.resource import Resource, ResourceNotFound
 from trac.ticket.api import TicketSystem
-from trac.util import sorted, embedded_numbers
+from trac.util import embedded_numbers
 from trac.util.datefmt import utc, utcmax, to_timestamp
 from trac.util.translation import _
 

Diff for: trac/ticket/query.py

@@ -16,6 +16,7 @@
 # Author: Christopher Lenz <[email protected]>
 
 import csv
+from itertools import groupby
 from math import ceil
 from datetime import datetime, timedelta
 import re
@@ -30,7 +31,6 @@
 from trac.resource import Resource
 from trac.ticket.api import TicketSystem
 from trac.util import Ranges
-from trac.util.compat import groupby
 from trac.util.datefmt import to_timestamp, utc
 from trac.util.presentation import Paginator
 from trac.util.text import shorten_line

Diff for: trac/ticket/report.py

@@ -28,7 +28,6 @@
 from trac.mimeview import Context
 from trac.perm import IPermissionRequestor
 from trac.resource import Resource, ResourceNotFound
-from trac.util import sorted
 from trac.util.datefmt import format_datetime, format_time
 from trac.util.presentation import Paginator
 from trac.util.text import to_unicode, unicode_urlencode

Diff for: trac/ticket/roadmap.py

@@ -29,7 +29,6 @@
 from trac.perm import IPermissionRequestor
 from trac.resource import *
 from trac.search import ISearchSource, search_to_sql, shorten_result
-from trac.util.compat import set, sorted
 from trac.util.datefmt import parse_date, utc, to_timestamp, to_datetime, \
                               get_date_format_hint, get_datetime_format_hint, \
                               format_date, format_datetime

Diff for: trac/ticket/tests/conversion.py

@@ -3,7 +3,6 @@
 
 from trac import __version__ as TRAC_VERSION
 from trac.test import EnvironmentStub, Mock
-from trac.util import sorted
 from trac.ticket.model import Ticket
 from trac.ticket.web_ui import TicketModule
 from trac.mimeview.api import Mimeview

Diff for: trac/timeline/web_ui.py

@@ -30,7 +30,6 @@
 from trac.mimeview import Context
 from trac.perm import IPermissionRequestor
 from trac.timeline.api import ITimelineEventProvider
-from trac.util.compat import sorted
 from trac.util.datefmt import format_date, format_datetime, parse_date, \
                               to_timestamp, utc, pretty_timedelta
 from trac.util.text import to_unicode

Diff for: trac/util/__init__.py

@@ -28,7 +28,7 @@
 
 # Imports for backward compatibility
 from trac.core import TracError
-from trac.util.compat import reversed, sorted, tee, md5
+from trac.util.compat import md5
 from trac.util.html import escape, unescape, Markup, Deuglifier
 from trac.util.text import CRLF, to_utf8, to_unicode, shorten_line, \
                            wrap, pretty_size

Diff for: trac/util/compat.py

@@ -14,88 +14,9 @@
 # history and logs, available at http://trac.edgewall.org/log/.
 
 """Various classes and functions to provide some backwards-compatibility with
-previous versions of Python from 2.3 onward.
+previous versions of Python from 2.4 onward.
 """
 
-try:
-    set = set
-    frozenset = frozenset
-except NameError:
-    from sets import Set as set
-    from sets import ImmutableSet as frozenset
-
-try:
-    reversed = reversed
-except NameError:
-    def reversed(x):
-        if hasattr(x, 'keys'):
-            raise ValueError('mappings do not support reverse iteration')
-        i = len(x)
-        while i > 0:
-            i -= 1
-            yield x[i]
-
-try:
-    sorted = sorted
-except NameError:
-    def sorted(iterable, cmp=None, key=None, reverse=False):
-        """Partial implementation of the "sorted" function from Python 2.4"""
-        if key is None:
-            lst = list(iterable)
-        else:
-            lst = [(key(val), idx, val) for idx, val in enumerate(iterable)]
-        lst.sort()
-        if key is None:
-            if reverse:
-                return lst[::-1]
-            return lst
-        if reverse:
-            lst = reversed(lst)
-        return [i[-1] for i in lst]
-
-class py_groupby(object):
-    def __init__(self, iterable, key=None):
-        if key is None:
-            key = lambda x: x
-        self.keyfunc = key
-        self.it = iter(iterable)
-        self.tgtkey = self.currkey = self.currvalue = xrange(0)
-    def __iter__(self):
-        return self
-    def next(self):
-        while self.currkey == self.tgtkey:
-            self.currvalue = self.it.next() # Exit on StopIteration
-            self.currkey = self.keyfunc(self.currvalue)
-        self.tgtkey = self.currkey
-        return (self.currkey, self._grouper(self.tgtkey))
-    def _grouper(self, tgtkey):
-        while self.currkey == tgtkey:
-            yield self.currvalue
-            self.currvalue = self.it.next() # Exit on StopIteration
-            self.currkey = self.keyfunc(self.currvalue)
-try:
-    from itertools import groupby
-except ImportError:
-    groupby = py_groupby
-
-# Note: only used by pairwise, which is now deprecated
-#       (suggest to remove it from 0.12 as well)
-try:
-    from itertools import tee
-except ImportError:
-    from itertools import count
-    def tee(iterable):
-        def gen(next, data={}, cnt=[0]):
-            for i in count():
-                if i == cnt[0]:
-                    item = data[i] = next()
-                    cnt[0] += 1
-                else:
-                    item = data.pop(i)
-                yield item
-        it = iter(iterable)
-        return (gen(it.next), gen(it.next))
-
 try:
     all = all
     any = any

Diff for: trac/versioncontrol/svn_fs.py

@@ -55,7 +55,7 @@
 from trac.versioncontrol.cache import CachedRepository
 from trac.versioncontrol.svn_authz import SubversionAuthorizer
 from trac.versioncontrol.web_ui.browser import IPropertyRenderer
-from trac.util import sorted, embedded_numbers, reversed
+from trac.util import embedded_numbers
 from trac.util.text import to_unicode
 from trac.util.translation import _
 from trac.util.datefmt import utc

Diff for: trac/versioncontrol/web_ui/browser.py

@@ -29,7 +29,7 @@
                               IHTMLPreviewAnnotator, Context
 from trac.perm import IPermissionRequestor
 from trac.resource import ResourceNotFound, Resource
-from trac.util import sorted, embedded_numbers
+from trac.util import embedded_numbers
 from trac.util.datefmt import http_date, utc
 from trac.util.html import escape, Markup
 from trac.util.text import shorten_line

Diff for: trac/versioncontrol/web_ui/changeset.py

@@ -19,6 +19,7 @@
 #         Christian Boos <[email protected]>
 
 from datetime import datetime
+from itertools import groupby
 import os
 import posixpath
 import re
@@ -35,7 +36,7 @@
 from trac.search import ISearchSource, search_to_sql, shorten_result
 from trac.timeline.api import ITimelineEventProvider
 from trac.util import embedded_numbers, content_disposition
-from trac.util.compat import any, sorted, groupby
+from trac.util.compat import any
 from trac.util.datefmt import pretty_timedelta, utc
 from trac.util.text import unicode_urlencode, shorten_line, CRLF
 from trac.util.translation import _

Diff for: trac/web/chrome.py

@@ -15,6 +15,7 @@
 # Author: Christopher Lenz <[email protected]>
 
 import datetime
+from itertools import groupby
 import os
 import pkg_resources
 import pprint
@@ -47,7 +48,7 @@
 from trac.resource import *
 from trac.util import compat, get_reporter_id, presentation, get_pkginfo, \
                       get_module_path, translation, arity
-from trac.util.compat import partial, set
+from trac.util.compat import partial
 from trac.util.html import plaintext
 from trac.util.text import pretty_size, obfuscate_email_address, \
                            shorten_line, unicode_quote_plus, to_unicode
@@ -300,7 +301,7 @@ class Chrome(Component):
         'get_reporter_id': get_reporter_id,
         'gettext': translation.gettext,
         'group': presentation.group,
-        'groupby': compat.py_groupby,
+        'groupby': groupby,
         'http_date': http_date,
         'istext': presentation.istext,
         'ngettext': translation.ngettext,
@@ -311,10 +312,10 @@ class Chrome(Component):
         'pretty_size': pretty_size,
         'pretty_timedelta': pretty_timedelta,
         'quote_plus': unicode_quote_plus,
-        'reversed': compat.reversed,
+        'reversed': reversed,
         'separated': presentation.separated,
         'shorten_line': shorten_line,
-        'sorted': compat.sorted,
+        'sorted': sorted,
         'time': datetime.time,
         'timedelta': datetime.timedelta,
         'to_unicode': to_unicode,

Diff for: trac/web/main.py

@@ -44,7 +44,7 @@
 from trac.resource import ResourceNotFound
 from trac.util import get_lines_from_file, get_last_traceback, hex_entropy, \
                       arity, translation
-from trac.util.compat import partial, reversed
+from trac.util.compat import partial
 from trac.util.datefmt import format_datetime, http_date, localtz, timezone
 from trac.util.text import shorten_line, to_unicode
 from trac.web.api import *

Diff for: trac/wiki/api.py

@@ -30,7 +30,6 @@
 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

Diff for: trac/wiki/formatter.py

@@ -33,7 +33,6 @@
 from trac.core import *
 from trac.mimeview import *
 from trac.resource import get_relative_url
-from trac.util.compat import set
 from trac.wiki.api import WikiSystem, parse_args
 from trac.wiki.parser import WikiParser
 from trac.util.text import shorten_line, to_unicode, \

Diff for: trac/wiki/intertrac.py

@@ -21,7 +21,6 @@
 from trac.core import *
 from trac.mimeview import Context
 from trac.perm import PermissionError
-from trac.util import sorted
 from trac.util.translation import _
 from trac.web import IRequestHandler
 from trac.wiki.api import IWikiMacroProvider

Diff for: trac/wiki/interwiki.py

@@ -148,7 +148,6 @@ def get_macro_description(self, name):
         return "Provide a description list for the known InterWiki prefixes."
 
     def expand_macro(self, formatter, name, content):
-        from trac.util import sorted
         interwikis = []
         for k in sorted(self.keys()):
             prefix, url, title = self[k]

Diff for: trac/wiki/macros.py

@@ -15,6 +15,7 @@
 # Author: Christopher Lenz <[email protected]>
 
 from datetime import datetime
+from itertools import groupby
 import imp
 import inspect
 import os
@@ -27,7 +28,7 @@
 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 any
 from trac.util.html import escape
 from trac.util.text import unquote, to_unicode
 from trac.util.translation import _