Get rid of our backward implementation of set, sorted, reversed, and rpartition.

--HG--
branch : 4.0

15 files changed, 10 insertions, 61 deletions

diff --git a/TODO.txt b/TODO.txt
index 981c19c1..2d935161 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,7 +13,7 @@ Key:
     - --branch = True ?
 
 - Remove 2.3, 2.4, 2.5 limitations
-    - set, sorted, reversed, rpartition
+    + set, sorted, reversed, rpartition
     - generator expressions
     - decorators
     - collections.defaultdict
diff --git a/coverage/backward.py b/coverage/backward.py
index 7d268545..124d0253 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -8,47 +8,6 @@
 
 import os, re, sys
 
-# Python 2.3 doesn't have `set`
-try:
-    set = set       # new in 2.4
-except NameError:
-    from sets import Set as set
-
-# Python 2.3 doesn't have `sorted`.
-try:
-    sorted = sorted
-except NameError:
-    def sorted(iterable):
-        """A 2.3-compatible implementation of `sorted`."""
-        lst = list(iterable)
-        lst.sort()
-        return lst
-
-# Python 2.3 doesn't have `reversed`.
-try:
-    reversed = reversed
-except NameError:
-    def reversed(iterable):
-        """A 2.3-compatible implementation of `reversed`."""
-        lst = list(iterable)
-        return lst[::-1]
-
-# rpartition is new in 2.5
-try:
-    "".rpartition
-except AttributeError:
-    def rpartition(s, sep):
-        """Implement s.rpartition(sep) for old Pythons."""
-        i = s.rfind(sep)
-        if i == -1:
-            return ('', '', s)
-        else:
-            return (s[:i], sep, s[i+len(sep):])
-else:
-    def rpartition(s, sep):
-        """A common interface for new Pythons."""
-        return s.rpartition(sep)
-
 # Pythons 2 and 3 differ on where to get StringIO
 try:
     from cStringIO import StringIO
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 0881313e..f2f0c152 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -2,7 +2,6 @@
 
 import optparse, os, sys, traceback
 
-from coverage.backward import sorted                # pylint: disable=W0622
 from coverage.execfile import run_python_file, run_python_module
 from coverage.misc import CoverageException, ExceptionDuringRun, NoSource
 from coverage.debug import info_formatter
diff --git a/coverage/control.py b/coverage/control.py
index 4b76121c..31fc511e 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -3,7 +3,7 @@
 import atexit, os, random, socket, sys
 
 from coverage.annotate import AnnotateReporter
-from coverage.backward import string_class, iitems, sorted  # pylint: disable=W0622
+from coverage.backward import string_class, iitems
 from coverage.codeunit import code_unit_factory, CodeUnit
 from coverage.collector import Collector
 from coverage.config import CoverageConfig
diff --git a/coverage/data.py b/coverage/data.py
index fb88c5b1..a32e20a4 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -2,7 +2,7 @@
 
 import os
 
-from coverage.backward import iitems, pickle, sorted    # pylint: disable=W0622
+from coverage.backward import iitems, pickle
 from coverage.files import PathAliases
 from coverage.misc import file_be_gone
 
diff --git a/coverage/misc.py b/coverage/misc.py
index 2d2662da..70606287 100644
--- a/coverage/misc.py
+++ b/coverage/misc.py
@@ -5,7 +5,7 @@ import inspect
 import os
 import sys
 
-from coverage.backward import md5, sorted       # pylint: disable=W0622
+from coverage.backward import md5
 from coverage.backward import string_class, to_bytes
 
 
diff --git a/coverage/parser.py b/coverage/parser.py
index 581c8518..2663baca 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -2,9 +2,8 @@
 
 import dis, re, sys, token, tokenize
 
-from coverage.backward import set, sorted, StringIO # pylint: disable=W0622
+from coverage.backward import StringIO
 from coverage.backward import open_source, range    # pylint: disable=W0622
-from coverage.backward import reversed              # pylint: disable=W0622
 from coverage.backward import bytes_to_ints
 from coverage.bytecode import ByteCodes, CodeObjects
 from coverage.misc import nice_pair, expensive, join_regex
diff --git a/coverage/results.py b/coverage/results.py
index 2d13e818..6507d568 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -2,7 +2,7 @@
 
 import os
 
-from coverage.backward import iitems, set, sorted       # pylint: disable=W0622
+from coverage.backward import iitems
 from coverage.misc import format_lines, join_regex, NoSource
 from coverage.parser import CodeParser
 
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 78375249..1abfdefb 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -4,7 +4,6 @@ import os, sys, time
 import xml.dom.minidom
 
 from coverage import __url__, __version__
-from coverage.backward import sorted, rpartition    # pylint: disable=W0622
 from coverage.report import Reporter
 
 def rate(hit, num):
@@ -97,7 +96,7 @@ class XmlReporter(Reporter):
 
         # Create the 'lines' and 'package' XML elements, which
         # are populated later.  Note that a package == a directory.
-        package_name = rpartition(cu.name, ".")[0]
+        package_name = cu.name.rpartition(".")[0]
         className = cu.name
 
         package = self.packages.setdefault(package_name, [{}, 0, 0, 0, 0])
diff --git a/tests/backunittest.py b/tests/backunittest.py
index 30da78eb..019e811c 100644
--- a/tests/backunittest.py
+++ b/tests/backunittest.py
@@ -2,8 +2,6 @@
 
 import difflib, re, sys, unittest
 
-from coverage.backward import set                   # pylint: disable=W0622
-
 
 def _need(method):
     """Do we need to define our own `method` method?"""
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
index 9f7c79c9..4fe81910 100644
--- a/tests/coveragetest.py
+++ b/tests/coveragetest.py
@@ -4,8 +4,7 @@ import glob, imp, os, random, shlex, shutil, sys, tempfile, textwrap
 import atexit
 
 import coverage
-from coverage.backward import sorted, StringIO      # pylint: disable=W0622
-from coverage.backward import to_bytes
+from coverage.backward import StringIO, to_bytes
 from coverage.control import _TEST_NAME_FILE
 from tests.backtest import run_command
 from tests.backunittest import TestCase
diff --git a/tests/test_collector.py b/tests/test_collector.py
index 2714398a..af3814f3 100644
--- a/tests/test_collector.py
+++ b/tests/test_collector.py
@@ -4,7 +4,6 @@ import re
 
 import coverage
 from coverage.backward import StringIO
-from coverage.backward import set                   # pylint: disable=W0622
 
 from tests.coveragetest import CoverageTest
 
diff --git a/tests/test_config.py b/tests/test_config.py
index c44fa80c..0862d6b2 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """Test the config file handling for coverage.py"""
 
-import sys
 import coverage
 from coverage.misc import CoverageException
 
diff --git a/tests/test_files.py b/tests/test_files.py
index b24e8b8b..230cd092 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -4,7 +4,6 @@ import os, os.path
 
 from coverage.files import FileLocator, TreeMatcher, FnmatchMatcher
 from coverage.files import PathAliases, find_python_files, abs_file
-from coverage.backward import set                   # pylint: disable=W0622
 from coverage.misc import CoverageException
 
 from tests.coveragetest import CoverageTest
diff --git a/tests/test_testing.py b/tests/test_testing.py
index c56d8110..c6d51ba5 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -2,11 +2,10 @@
 """Tests that our test infrastructure is really working!"""
 
 import os, sys
-from coverage.backward import to_bytes, rpartition
+from coverage.backward import to_bytes
 from tests.backunittest import TestCase
 from tests.coveragetest import CoverageTest
 
-from coverage.backward import set                   # pylint: disable=W0622
 
 class TestingTest(TestCase):
     """Tests of helper methods on `backunittest.TestCase`."""
@@ -188,7 +187,7 @@ class CoverageTestTest(CoverageTest):
         executable = executable.split(":", 1)[1].strip()
         self.assertTrue(same_python_executable(executable, sys.executable))
         environ = [l for l in out if "COV_FOOBAR" in l][0]
-        _, _, environ = rpartition(environ, ":")
+        _, _, environ = environ.rpartition(":")
         self.assertEqual(environ.strip(), "COV_FOOBAR = XYZZY")