bpo-31583: Fix 2to3 for using with --add-suffix option (GH-3758) (#6528)

miss-islington · denis-osipov · ambv · commit 67067d85eb1d · 2018-04-18T17:15:09.000-07:00
(cherry picked from commit e3a523a) Co-authored-by: Denis Osipov <osipov_d@list.ru>
diff --git a/Lib/lib2to3/main.py b/Lib/lib2to3/main.py
@@ -80,7 +80,7 @@ def write_file(self, new_text, filename, old_text, encoding):
             filename += self._append_suffix
         if orig_filename != filename:
             output_dir = os.path.dirname(filename)
-            if not os.path.isdir(output_dir):
+            if not os.path.isdir(output_dir) and output_dir:
                 os.makedirs(output_dir)
             self.log_message('Writing converted %s to %s.', orig_filename,
                              filename)
diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-09-26-10-11-21.bpo-31583.TM90_H.rst b/Misc/NEWS.d/next/Tools-Demos/2017-09-26-10-11-21.bpo-31583.TM90_H.rst
@@ -0,0 +1,2 @@
+Fix 2to3 for using with --add-suffix option but without --output-dir
+option for relative path to files in current directory.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix 2to3 for using with --add-suffix option but without --output-dir`
	`2`	`+option for relative path to files in current directory.`