[Python-checkins] distutils2: Merged changes.

[tarek.ziade]

tarek.ziade pushed 24b3ffc522d9 to distutils2:

http://hg.python.org/distutils2/rev/24b3ffc522d9
changeset:   881:24b3ffc522d9
parent:      867:d5a104df0675
parent:      880:07f0fb79f31a
user:        Louis Munro <lm at louismunro.com>
date:        Wed Dec 08 23:00:17 2010 -0500
summary:
  Merged changes.

files:
  distutils2/tests/test_ccompiler.py

diff --git a/distutils2/dist.py b/distutils2/dist.py
--- a/distutils2/dist.py
+++ b/distutils2/dist.py
@@ -5,7 +5,6 @@
 """
 
 
-import sys
 import os
 import re
 import warnings
diff --git a/distutils2/tests/test_command_check.py b/distutils2/tests/test_command_check.py
--- a/distutils2/tests/test_command_check.py
+++ b/distutils2/tests/test_command_check.py
@@ -62,7 +62,6 @@
 
     def test_check_all(self):
 
-        metadata = {'home_page': 'xxx', 'author': 'xxx'}
         self.assertRaises(DistutilsSetupError, self._run,
                           {}, **{'strict': 1,
                                  'all': 1})
diff --git a/distutils2/tests/test_command_cmd.py b/distutils2/tests/test_command_cmd.py
--- a/distutils2/tests/test_command_cmd.py
+++ b/distutils2/tests/test_command_cmd.py
@@ -17,22 +17,6 @@
         dist = Distribution()
         self.cmd = MyCmd(dist)
 
-    def test_ensure_string_list(self):
-
-        cmd = self.cmd
-        cmd.not_string_list = ['one', 2, 'three']
-        cmd.yes_string_list = ['one', 'two', 'three']
-        cmd.not_string_list2 = object()
-        cmd.yes_string_list2 = 'ok'
-        cmd.ensure_string_list('yes_string_list')
-        cmd.ensure_string_list('yes_string_list2')
-
-        self.assertRaises(DistutilsOptionError,
-                          cmd.ensure_string_list, 'not_string_list')
-
-        self.assertRaises(DistutilsOptionError,
-                          cmd.ensure_string_list, 'not_string_list2')
-
     def test_make_file(self):
 
         cmd = self.cmd
diff --git a/distutils2/tests/test_command_install_data.py b/distutils2/tests/test_command_install_data.py
--- a/distutils2/tests/test_command_install_data.py
+++ b/distutils2/tests/test_command_install_data.py
@@ -1,7 +1,5 @@
 """Tests for distutils.command.install_data."""
-import sys
 import os
-import getpass
 
 from distutils2.command.install_data import install_data
 from distutils2.tests import unittest, support
@@ -53,7 +51,6 @@
 
         # now using root and empty dir
         cmd.root = os.path.join(pkg_dir, 'root')
-        inst3 = os.path.join(cmd.install_dir, 'inst3')
         inst4 = os.path.join(pkg_dir, 'inst4')
         three = os.path.join(cmd.install_dir, 'three')
         self.write_file(three, 'xx')
diff --git a/distutils2/tests/test_command_install_distinfo.py b/distutils2/tests/test_command_install_distinfo.py
--- a/distutils2/tests/test_command_install_distinfo.py
+++ b/distutils2/tests/test_command_install_distinfo.py
@@ -1,7 +1,6 @@
 """Tests for ``distutils2.command.install_distinfo``. """
 
 import os
-import sys
 import csv
 
 from distutils2.command.install_distinfo import install_distinfo
diff --git a/distutils2/tests/test_command_install_headers.py b/distutils2/tests/test_command_install_headers.py
--- a/distutils2/tests/test_command_install_headers.py
+++ b/distutils2/tests/test_command_install_headers.py
@@ -1,7 +1,5 @@
 """Tests for distutils.command.install_headers."""
-import sys
 import os
-import getpass
 
 from distutils2.command.install_headers import install_headers
 from distutils2.tests import unittest, support
diff --git a/distutils2/tests/test_command_register.py b/distutils2/tests/test_command_register.py
--- a/distutils2/tests/test_command_register.py
+++ b/distutils2/tests/test_command_register.py
@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 """Tests for distutils.command.register."""
-import sys
 import os
 import getpass
 import urllib2

--
Repository URL: http://hg.python.org/distutils2