From 43f289ad8882a743d03b92a430f7ab7616e96673 Mon Sep 17 00:00:00 2001 From: Tarek Ziade Date: Mon, 30 May 2011 11:07:54 +0200 Subject: [PATCH] cleanup packaging.database --- Lib/packaging/database.py | 3 +-- Lib/packaging/tests/test_database.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Lib/packaging/database.py b/Lib/packaging/database.py index 010c4eb572c..22d4b138edb 100644 --- a/Lib/packaging/database.py +++ b/Lib/packaging/database.py @@ -18,8 +18,7 @@ __all__ = [ 'get_distributions', 'get_distribution', 'get_file_users', 'provides_distribution', 'obsoletes_distribution', 'enable_cache', 'disable_cache', 'clear_cache', - 'get_file_path', 'get_file' -] + 'get_file_path', 'get_file'] # TODO update docs diff --git a/Lib/packaging/tests/test_database.py b/Lib/packaging/tests/test_database.py index e0c16dec82e..e965c60773f 100644 --- a/Lib/packaging/tests/test_database.py +++ b/Lib/packaging/tests/test_database.py @@ -1,23 +1,20 @@ import os import io import csv -import imp import sys import shutil -import zipfile import tempfile from os.path import relpath # separate import for backport concerns from hashlib import md5 from textwrap import dedent -from packaging.tests import unittest from packaging.tests.test_util import GlobTestCaseBase from packaging.tests.support import requires_zlib from packaging.config import get_resources_dests from packaging.errors import PackagingError from packaging.metadata import Metadata -from packaging.tests import unittest, run_unittest, support, TESTFN +from packaging.tests import unittest, support from packaging.database import ( Distribution, EggInfoDistribution, get_distribution, get_distributions, provides_distribution, obsoletes_distribution, get_file_users, @@ -582,7 +579,8 @@ class DataFilesTestCase(GlobTestCaseBase): ('', os.path.join('developer-docs', '**', '*.txt'), '{doc}'), ('', 'README', '{doc}'), ('mailman/etc/', '*', '{config}'), - ('mailman/foo/', os.path.join('**', 'bar', '*.cfg'), '{config}/baz'), + ('mailman/foo/', os.path.join('**', 'bar', '*.cfg'), + '{config}/baz'), ('mailman/foo/', os.path.join('**', '*.cfg'), '{config}/hmm'), ('', 'some-new-semantic.sns', '{funky-crazy-category}'), ]