[Python-checkins] cpython (2.7): Issue #13193: Fix distutils.filelist tests to always use / as path separator.

nadeem.vawda python-checkins at python.org
Mon Feb 13 20:34:19 CET 2012


http://hg.python.org/cpython/rev/3925081a7ca0
changeset:   74916:3925081a7ca0
branch:      2.7
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Mon Feb 13 21:33:51 2012 +0200
summary:
  Issue #13193: Fix distutils.filelist tests to always use / as path separator.

files:
  Lib/distutils/tests/test_filelist.py |  24 +++++++--------
  1 files changed, 11 insertions(+), 13 deletions(-)


diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
--- a/Lib/distutils/tests/test_filelist.py
+++ b/Lib/distutils/tests/test_filelist.py
@@ -1,7 +1,6 @@
 """Tests for distutils.filelist."""
 import re
 import unittest
-from os.path import join
 from distutils import debug
 from distutils.log import WARN
 from distutils.errors import DistutilsTemplateError
@@ -54,15 +53,15 @@
 
         # simulated file list
         file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
-                              join('global', 'one.txt'),
-                              join('global', 'two.txt'),
-                              join('global', 'files.x'),
-                              join('global', 'here.tmp'),
-                              join('f', 'o', 'f.oo'),
-                              join('dir', 'graft-one'),
-                              join('dir', 'dir2', 'graft2'),
-                              join('dir3', 'ok'),
-                              join('dir3', 'sub', 'ok.txt'),
+                              'global/one.txt',
+                              'global/two.txt',
+                              'global/files.x',
+                              'global/here.tmp',
+                              'f/o/f.oo',
+                              'dir/graft-one',
+                              'dir/dir2/graft2',
+                              'dir3/ok',
+                              'dir3/sub/ok.txt',
                               ]
 
         for line in MANIFEST_IN.split('\n'):
@@ -70,9 +69,8 @@
                 continue
             file_list.process_template_line(line)
 
-        wanted = ['ok', 'four.txt', join('global', 'one.txt'),
-                  join('global', 'two.txt'), join('f', 'o', 'f.oo'),
-                  join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
+        wanted = ['ok', 'four.txt', 'global/one.txt', 'global/two.txt',
+                  'f/o/f.oo', 'dir/graft-one', 'dir/dir2/graft2']
 
         self.assertEqual(file_list.files, wanted)
 

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


More information about the Python-checkins mailing list