From 6685883c02b29b66813343e6380133cd49df4300 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 29 Aug 2014 07:07:35 +0300
Subject: Issue #22182: Use e.args to unpack exceptions correctly in
 distutils.file_util.move_file.

Patch by Claudiu Popa.
---
 Lib/distutils/file_util.py            |  4 ++--
 Lib/distutils/tests/test_file_util.py | 20 ++++++++++++++++++++
 Misc/NEWS                             |  3 +++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py
index f6ed290..7b14efb 100644
--- a/Lib/distutils/file_util.py
+++ b/Lib/distutils/file_util.py
@@ -194,7 +194,7 @@ def move_file (src, dst,
     try:
         os.rename(src, dst)
     except OSError as e:
-        (num, msg) = e
+        (num, msg) = e.args
         if num == errno.EXDEV:
             copy_it = True
         else:
@@ -206,7 +206,7 @@ def move_file (src, dst,
         try:
             os.unlink(src)
         except OSError as e:
-            (num, msg) = e
+            (num, msg) = e.args
             try:
                 os.unlink(dst)
             except OSError:
diff --git a/Lib/distutils/tests/test_file_util.py b/Lib/distutils/tests/test_file_util.py
index 3c3e3dc..270f81e 100644
--- a/Lib/distutils/tests/test_file_util.py
+++ b/Lib/distutils/tests/test_file_util.py
@@ -2,10 +2,13 @@
 import unittest
 import os
 import shutil
+import errno
+from unittest.mock import patch
 
 from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
+from distutils.errors import DistutilsFileError
 from test.support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -58,6 +61,23 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEqual(self._logs, wanted)
 
+    @patch('os.rename', side_effect=OSError('wrong', 1))
+    def test_move_file_exception_unpacking_rename(self, _):
+        # see issue 22182
+        with self.assertRaises(DistutilsFileError):
+            with open(self.source, 'w') as fobj:
+                fobj.write('spam eggs')
+            move_file(self.source, self.target, verbose=0)
+
+    @patch('os.rename', side_effect=OSError(errno.EXDEV, 'wrong'))
+    @patch('os.unlink', side_effect=OSError('wrong', 1))
+    def test_move_file_exception_unpacking_unlink(self, rename, unlink):
+        # see issue 22182
+        with self.assertRaises(DistutilsFileError):
+            with open(self.source, 'w') as fobj:
+                fobj.write('spam eggs')
+            move_file(self.source, self.target, verbose=0)
+
 
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
diff --git a/Misc/NEWS b/Misc/NEWS
index bc90861..854fc73 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #22182: Use e.args to unpack exceptions correctly in
+  distutils.file_util.move_file. Patch by Claudiu Popa.
+
 - The webbrowser module now uses subprocess's start_new_session=True rather
   than a potentially risky preexec_fn=os.setsid call.
 
-- 
cgit v0.12