diff options
-rw-r--r-- | doc/conf.py | 2 | ||||
-rw-r--r-- | snakeoil/compression/_util.py | 2 | ||||
-rw-r--r-- | snakeoil/currying.py | 1 | ||||
-rw-r--r-- | snakeoil/demandload.py | 1 | ||||
-rw-r--r-- | snakeoil/descriptors.py | 2 | ||||
-rw-r--r-- | snakeoil/iterables.py | 2 | ||||
-rw-r--r-- | snakeoil/klass.py | 1 | ||||
-rw-r--r-- | snakeoil/test/test_bash.py | 2 | ||||
-rw-r--r-- | snakeoil/test/test_compatibility.py | 2 | ||||
-rw-r--r-- | snakeoil/test/test_data_source.py | 4 | ||||
-rw-r--r-- | snakeoil/test/test_demandload_usage.py | 6 | ||||
-rw-r--r-- | snakeoil/test/test_fileutils.py | 1 | ||||
-rw-r--r-- | snakeoil/test/test_formatters.py | 1 | ||||
-rw-r--r-- | snakeoil/test/test_iterables.py | 2 | ||||
-rw-r--r-- | snakeoil/test/test_klass.py | 2 | ||||
-rw-r--r-- | snakeoil/test/test_obj.py | 3 | ||||
-rw-r--r-- | snakeoil/test/test_osutils.py | 2 | ||||
-rw-r--r-- | snakeoil/test/test_py3k_eq_hash_inheritance.py | 3 | ||||
-rw-r--r-- | snakeoil/test/test_slot_shadowing.py | 3 | ||||
-rw-r--r-- | snakeoil/test/test_source_hygene.py | 2 |
20 files changed, 8 insertions, 36 deletions
diff --git a/doc/conf.py b/doc/conf.py index e9dc2bc..8186582 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,8 +11,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/snakeoil/compression/_util.py b/snakeoil/compression/_util.py index 337d6f2..12e44e0 100644 --- a/snakeoil/compression/_util.py +++ b/snakeoil/compression/_util.py @@ -5,10 +5,8 @@ __all__ = ("compress_data", "decompress_data") import errno import os -import signal import subprocess -from snakeoil import klass from snakeoil.weakrefs import WeakRefFinalizer def _drive_process(args, mode, data): diff --git a/snakeoil/currying.py b/snakeoil/currying.py index e1a3c02..26aabed 100644 --- a/snakeoil/currying.py +++ b/snakeoil/currying.py @@ -32,7 +32,6 @@ should be identical. Because :py:func:`partial` has an implementation in c while :py:func:`pre_curry` is python you should use :py:func:`partial` if possible. """ -from operator import attrgetter import sys from snakeoil import compatibility diff --git a/snakeoil/demandload.py b/snakeoil/demandload.py index dc85c6f..3cf06bf 100644 --- a/snakeoil/demandload.py +++ b/snakeoil/demandload.py @@ -38,7 +38,6 @@ import os import sys from snakeoil.modules import load_any -from snakeoil.currying import partial from snakeoil import compatibility # There are some demandloaded imports below the definition of demandload. diff --git a/snakeoil/descriptors.py b/snakeoil/descriptors.py index ae5fe64..aa2362e 100644 --- a/snakeoil/descriptors.py +++ b/snakeoil/descriptors.py @@ -4,8 +4,6 @@ """Classes implementing the descriptor protocol.""" -from __future__ import print_function - __all__ = ("classproperty",) diff --git a/snakeoil/iterables.py b/snakeoil/iterables.py index 7315253..cc4ab08 100644 --- a/snakeoil/iterables.py +++ b/snakeoil/iterables.py @@ -10,7 +10,7 @@ from __future__ import print_function __all__ = ("expandable_chain", "caching_iter", "iter_sort") from collections import deque -from itertools import islice, chain +from itertools import islice class expandable_chain(object): diff --git a/snakeoil/klass.py b/snakeoil/klass.py index d097a17..f49d08d 100644 --- a/snakeoil/klass.py +++ b/snakeoil/klass.py @@ -20,7 +20,6 @@ __all__ = ("generic_equality", "reflective_hash", "inject_richcmp_methods_from_c from collections import deque from operator import attrgetter -import sys from snakeoil import caching, compatibility from snakeoil.currying import partial, post_curry diff --git a/snakeoil/test/test_bash.py b/snakeoil/test/test_bash.py index f927f13..b33f2dd 100644 --- a/snakeoil/test/test_bash.py +++ b/snakeoil/test/test_bash.py @@ -4,10 +4,8 @@ import os -import tempfile from StringIO import StringIO -from snakeoil import compatibility from snakeoil.test.mixins import mk_named_tempfile from snakeoil.test import TestCase diff --git a/snakeoil/test/test_compatibility.py b/snakeoil/test/test_compatibility.py index 93080f6..c6e0192 100644 --- a/snakeoil/test/test_compatibility.py +++ b/snakeoil/test/test_compatibility.py @@ -6,7 +6,7 @@ from operator import itemgetter from snakeoil.test import TestCase from snakeoil import compatibility -from snakeoil.currying import post_curry + class override_mixin(object): diff --git a/snakeoil/test/test_data_source.py b/snakeoil/test/test_data_source.py index 30695ac..b2ed6df 100644 --- a/snakeoil/test/test_data_source.py +++ b/snakeoil/test/test_data_source.py @@ -1,9 +1,7 @@ # Copyright: 2006-2011 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD -import os - -from snakeoil import compatibility, compression, currying, data_source, stringio +from snakeoil import compatibility, compression, currying, data_source from snakeoil.test import TestCase, mixins from snakeoil.osutils import pjoin diff --git a/snakeoil/test/test_demandload_usage.py b/snakeoil/test/test_demandload_usage.py index 0657313..52e902e 100644 --- a/snakeoil/test/test_demandload_usage.py +++ b/snakeoil/test/test_demandload_usage.py @@ -1,12 +1,8 @@ # Copyright: 2005-2011 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -import errno -import os -import stat - from snakeoil.test import TestCase, mixins -from snakeoil import compatibility + class TestDemandLoadTargets(mixins.PythonNamespaceWalker, TestCase): diff --git a/snakeoil/test/test_fileutils.py b/snakeoil/test/test_fileutils.py index dc6d0d8..00e02e7 100644 --- a/snakeoil/test/test_fileutils.py +++ b/snakeoil/test/test_fileutils.py @@ -6,7 +6,6 @@ import errno import mmap import os -from StringIO import StringIO pjoin = os.path.join diff --git a/snakeoil/test/test_formatters.py b/snakeoil/test/test_formatters.py index 2fbdf12..412f984 100644 --- a/snakeoil/test/test_formatters.py +++ b/snakeoil/test/test_formatters.py @@ -10,7 +10,6 @@ import curses import os import pty -import sys from tempfile import TemporaryFile from snakeoil.test import SkipTest, TestCase, mk_cpy_loadable_testcase, protect_process diff --git a/snakeoil/test/test_iterables.py b/snakeoil/test/test_iterables.py index 461d6bd..4163ab2 100644 --- a/snakeoil/test/test_iterables.py +++ b/snakeoil/test/test_iterables.py @@ -1,9 +1,7 @@ # Copyright: 2006 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 -import itertools import operator -import sys from snakeoil.test import TestCase from snakeoil.iterables import expandable_chain, caching_iter, iter_sort diff --git a/snakeoil/test/test_klass.py b/snakeoil/test/test_klass.py index bdbf606..4f0ad0a 100644 --- a/snakeoil/test/test_klass.py +++ b/snakeoil/test/test_klass.py @@ -3,7 +3,7 @@ from time import time -from snakeoil.test import TestCase, mk_cpy_loadable_testcase, test_currying +from snakeoil.test import TestCase, mk_cpy_loadable_testcase from snakeoil import klass, currying from snakeoil.compatibility import cmp, is_py3k diff --git a/snakeoil/test/test_obj.py b/snakeoil/test/test_obj.py index 21864e8..5e28509 100644 --- a/snakeoil/test/test_obj.py +++ b/snakeoil/test/test_obj.py @@ -1,9 +1,6 @@ # Copyright: 2006-2011 Brian Harring <ferringb@gmail.com> # License: BSD/GPL2 - -import operator - from snakeoil.test import TestCase from snakeoil import obj diff --git a/snakeoil/test/test_osutils.py b/snakeoil/test/test_osutils.py index e6b351a..3b2d800 100644 --- a/snakeoil/test/test_osutils.py +++ b/snakeoil/test/test_osutils.py @@ -7,7 +7,7 @@ import grp import os import stat -from snakeoil import compatibility, osutils +from snakeoil import osutils from snakeoil.test import TestCase, SkipTest, mk_cpy_loadable_testcase from snakeoil.osutils import native_readdir from snakeoil.test.mixins import TempDirMixin diff --git a/snakeoil/test/test_py3k_eq_hash_inheritance.py b/snakeoil/test/test_py3k_eq_hash_inheritance.py index f006a3d..97e535a 100644 --- a/snakeoil/test/test_py3k_eq_hash_inheritance.py +++ b/snakeoil/test/test_py3k_eq_hash_inheritance.py @@ -1,9 +1,8 @@ # Copyright: 2010-2011 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD 3 clause -import sys +from snakeoil.test import mixins, TestCase -from snakeoil.test import mixins, TestCase, test_demandload_usage class Test(mixins.TargetedNamespaceWalker, mixins.KlassWalker, TestCase): diff --git a/snakeoil/test/test_slot_shadowing.py b/snakeoil/test/test_slot_shadowing.py index 2e4b991..a14e606 100644 --- a/snakeoil/test/test_slot_shadowing.py +++ b/snakeoil/test/test_slot_shadowing.py @@ -1,9 +1,8 @@ # Copyright: 2009-2011 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD -import inspect +from snakeoil.test import mixins, TestCase -from snakeoil.test import mixins, TestCase, test_demandload_usage class Test_slot_shadowing(mixins.TargetedNamespaceWalker, mixins.SubclassWalker, TestCase): diff --git a/snakeoil/test/test_source_hygene.py b/snakeoil/test/test_source_hygene.py index cdf35bc..90b6ad6 100644 --- a/snakeoil/test/test_source_hygene.py +++ b/snakeoil/test/test_source_hygene.py @@ -1,8 +1,6 @@ # Copyright: 2010-2011 Brian Harring <ferringb@gmail.com> # License: GPL2/BSD 3 clause -import sys - from snakeoil.test import TestCase, mixins class Test_modules(mixins.PythonNamespaceWalker, TestCase): |