cant mix mapping-style and tuple-style formatting in a format string; fixes #366

2 files changed, 5 insertions, 7 deletions

diff --git a/pyramid/scaffolds/copydir.py b/pyramid/scaffolds/copydir.py
index 2fab5d24b..c99238d33 100644
--- a/pyramid/scaffolds/copydir.py
+++ b/pyramid/scaffolds/copydir.py
@@ -161,8 +161,7 @@ def should_skip_file(name):
     if name.endswith('~') or name.endswith('.bak'):
         return 'Skipping backup file %(filename)s'
     if name.endswith('.pyc') or name.endswith('.pyo'):
-        return 'Skipping %s file %(filename)s' % os.path.splitext(name)[1]
-        # return 'Skipping %s file ' % os.path.splitext(name)[1] + '%(filename)s'
+        return 'Skipping %s file ' % os.path.splitext(name)[1] + '%(filename)s'
     if name.endswith('$py.class'):
         return 'Skipping $py.class file %(filename)s'
     if name in ('CVS', '_darcs'):
diff --git a/pyramid/tests/test_scaffolds/test_copydir.py b/pyramid/tests/test_scaffolds/test_copydir.py
index 6458b5dbc..01f9b19ff 100644
--- a/pyramid/tests/test_scaffolds/test_copydir.py
+++ b/pyramid/tests/test_scaffolds/test_copydir.py
@@ -237,11 +237,10 @@ class Test_should_skip_file(unittest.TestCase):
 
     def test_should_skip_bytecompiled_file(self):
         for name in ('afilename.pyc', 'afilename.pyo'):
-            # extension = os.path.splitext(name)[1]
-            # self.assertEqual(
-            #     self._callFUT(name),
-            #     'Skipping %s file ' % extension + '%(filename)s')
-            self.assertRaises(TypeError, self._callFUT, name)
+            extension = os.path.splitext(name)[1]
+            self.assertEqual(
+                self._callFUT(name),
+                'Skipping %s file ' % extension + '%(filename)s')
 
     def test_should_skip_jython_class_file(self):
         self.assertEqual(