Merge pull request #488 from mxr/strpath

asottile · web-flow · commit 0e509ddcbcfe · 2020-05-20T10:32:27.000-07:00
Don't use LocalPath.strpath
diff --git a/tests/check_added_large_files_test.py b/tests/check_added_large_files_test.py
@@ -75,7 +75,7 @@ def has_gitlfs():
 @xfailif_no_gitlfs
 def test_allows_gitlfs(temp_git_dir, monkeypatch):  # pragma: no cover
     with temp_git_dir.as_cwd():
-        monkeypatch.setenv('HOME', str(temp_git_dir.strpath))
+        monkeypatch.setenv('HOME', str(temp_git_dir))
         cmd_output('git', 'lfs', 'install')
         temp_git_dir.join('f.py').write('a' * 10000)
         cmd_output('git', 'lfs', 'track', 'f.py')
@@ -87,7 +87,7 @@ def test_allows_gitlfs(temp_git_dir, monkeypatch):  # pragma: no cover
 @xfailif_no_gitlfs
 def test_moves_with_gitlfs(temp_git_dir, monkeypatch):  # pragma: no cover
     with temp_git_dir.as_cwd():
-        monkeypatch.setenv('HOME', str(temp_git_dir.strpath))
+        monkeypatch.setenv('HOME', str(temp_git_dir))
         cmd_output('git', 'lfs', 'install')
         cmd_output('git', 'lfs', 'track', 'a.bin', 'b.bin')
         # First add the file we're going to move
diff --git a/tests/check_builtin_literals_test.py b/tests/check_builtin_literals_test.py
@@ -131,19 +131,19 @@ def test_ignore_constructors():
 def test_failing_file(tmpdir):
     f = tmpdir.join('f.py')
     f.write(BUILTIN_CONSTRUCTORS)
-    rc = main([f.strpath])
+    rc = main([str(f)])
     assert rc == 1
 
 
 def test_passing_file(tmpdir):
     f = tmpdir.join('f.py')
     f.write(BUILTIN_LITERALS)
-    rc = main([f.strpath])
+    rc = main([str(f)])
     assert rc == 0
 
 
 def test_failing_file_ignore_all(tmpdir):
     f = tmpdir.join('f.py')
     f.write(BUILTIN_CONSTRUCTORS)
-    rc = main(['--ignore=complex,dict,float,int,list,str,tuple', f.strpath])
+    rc = main(['--ignore=complex,dict,float,int,list,str,tuple', str(f)])
     assert rc == 0
diff --git a/tests/check_byte_order_marker_test.py b/tests/check_byte_order_marker_test.py
@@ -4,10 +4,10 @@
 def test_failure(tmpdir):
     f = tmpdir.join('f.txt')
     f.write_text('ohai', encoding='utf-8-sig')
-    assert check_byte_order_marker.main((f.strpath,)) == 1
+    assert check_byte_order_marker.main((str(f),)) == 1
 
 
 def test_success(tmpdir):
     f = tmpdir.join('f.txt')
     f.write_text('ohai', encoding='utf-8')
-    assert check_byte_order_marker.main((f.strpath,)) == 0
+    assert check_byte_order_marker.main((str(f),)) == 0
diff --git a/tests/check_docstring_first_test.py b/tests/check_docstring_first_test.py
@@ -56,12 +56,12 @@ def test_unit(capsys, contents, expected, expected_out):
 def test_integration(tmpdir, capsys, contents, expected, expected_out):
     f = tmpdir.join('test.py')
     f.write_binary(contents)
-    assert main([f.strpath]) == expected
-    assert capsys.readouterr()[0] == expected_out.format(filename=f.strpath)
+    assert main([str(f)]) == expected
+    assert capsys.readouterr()[0] == expected_out.format(filename=str(f))
 
 
 def test_arbitrary_encoding(tmpdir):
     f = tmpdir.join('f.py')
     contents = '# -*- coding: cp1252\nx = "£"'.encode('cp1252')
     f.write_binary(contents)
-    assert main([f.strpath]) == 0
+    assert main([str(f)]) == 0
diff --git a/tests/check_executables_have_shebangs_test.py b/tests/check_executables_have_shebangs_test.py
@@ -25,7 +25,7 @@
 def test_has_shebang(content, tmpdir):
     path = tmpdir.join('path')
     path.write(content, 'wb')
-    assert main((path.strpath,)) == 0
+    assert main((str(path),)) == 0
 
 
 @skip_win32  # pragma: win32 no cover
@@ -41,7 +41,7 @@ def test_has_shebang(content, tmpdir):
 def test_bad_shebang(content, tmpdir, capsys):
     path = tmpdir.join('path')
     path.write(content, 'wb')
-    assert main((path.strpath,)) == 1
+    assert main((str(path),)) == 1
     _, stderr = capsys.readouterr()
     assert stderr.startswith(f'{path}: marked executable but')
 
diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
@@ -16,13 +16,13 @@ def f1_is_a_conflict_file(tmpdir):
     repo2 = tmpdir.join('repo2')
     repo2_f1 = repo2.join('f1')
 
-    cmd_output('git', 'init', '--', repo1.strpath)
+    cmd_output('git', 'init', '--', str(repo1))
     with repo1.as_cwd():
         repo1_f1.ensure()
         cmd_output('git', 'add', '.')
         cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
 
-    cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
+    cmd_output('git', 'clone', str(repo1), str(repo2))
 
     # Commit in master
     with repo1.as_cwd():
@@ -71,13 +71,13 @@ def repository_pending_merge(tmpdir):
     repo2 = tmpdir.join('repo2')
     repo2_f1 = repo2.join('f1')
     repo2_f2 = repo2.join('f2')
-    cmd_output('git', 'init', repo1.strpath)
+    cmd_output('git', 'init', str(repo1))
     with repo1.as_cwd():
         repo1_f1.ensure()
         cmd_output('git', 'add', '.')
         cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
 
-    cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
+    cmd_output('git', 'clone', str(repo1), str(repo2))
 
     # Commit in master
     with repo1.as_cwd():
diff --git a/tests/check_symlinks_test.py b/tests/check_symlinks_test.py
@@ -16,8 +16,8 @@ def test_main(tmpdir, dest, expected):  # pragma: no cover (symlinks)
     tmpdir.join('exists').ensure()
     symlink = tmpdir.join('symlink')
     symlink.mksymlinkto(tmpdir.join(dest))
-    assert main((symlink.strpath,)) == expected
+    assert main((str(symlink),)) == expected
 
 
 def test_main_normal_file(tmpdir):
-    assert main((tmpdir.join('f').ensure().strpath,)) == 0
+    assert main((str(tmpdir.join('f').ensure()),)) == 0
diff --git a/tests/check_toml_test.py b/tests/check_toml_test.py
@@ -8,7 +8,7 @@ def test_toml_bad(tmpdir):
 
 = "no key name"  # INVALID
 """)
-    ret = main((filename.strpath,))
+    ret = main((str(filename),))
     assert ret == 1
 
 
@@ -25,12 +25,12 @@ def test_toml_good(tmpdir):
 dob = 1979-05-27T07:32:00-08:00 # First class dates
 """,
     )
-    ret = main((filename.strpath,))
+    ret = main((str(filename),))
     assert ret == 0
 
 
 def test_toml_good_unicode(tmpdir):
     filename = tmpdir.join('f')
     filename.write_binary('letter = "\N{SNOWMAN}"\n'.encode())
-    ret = main((filename.strpath,))
+    ret = main((str(filename),))
     assert ret == 0
diff --git a/tests/check_vcs_permalinks_test.py b/tests/check_vcs_permalinks_test.py
@@ -3,7 +3,7 @@
 
 def test_trivial(tmpdir):
     f = tmpdir.join('f.txt').ensure()
-    assert not main((f.strpath,))
+    assert not main((str(f),))
 
 
 def test_passing(tmpdir):
@@ -16,7 +16,7 @@ def test_passing(tmpdir):
         # regression test for overly-greedy regex
         b'https://github.com/ yes / no ? /blob/master/foo#L1\n',
     )
-    assert not main((f.strpath,))
+    assert not main((str(f),))
 
 
 def test_failing(tmpdir, capsys):
diff --git a/tests/check_yaml_test.py b/tests/check_yaml_test.py
@@ -20,16 +20,16 @@ def test_main_allow_multiple_documents(tmpdir):
     f.write('---\nfoo\n---\nbar\n')
 
     # should fail without the setting
-    assert main((f.strpath,))
+    assert main((str(f),))
 
     # should pass when we allow multiple documents
-    assert not main(('--allow-multiple-documents', f.strpath))
+    assert not main(('--allow-multiple-documents', str(f)))
 
 
 def test_fails_even_with_allow_multiple_documents(tmpdir):
     f = tmpdir.join('test.yaml')
     f.write('[')
-    assert main(('--allow-multiple-documents', f.strpath))
+    assert main(('--allow-multiple-documents', str(f)))
 
 
 def test_main_unsafe(tmpdir):
@@ -40,12 +40,12 @@ def test_main_unsafe(tmpdir):
         '    deadbeefdeadbeefdeadbeef\n',
     )
     # should fail "safe" check
-    assert main((f.strpath,))
+    assert main((str(f),))
     # should pass when we allow unsafe documents
-    assert not main(('--unsafe', f.strpath))
+    assert not main(('--unsafe', str(f)))
 
 
 def test_main_unsafe_still_fails_on_syntax_errors(tmpdir):
     f = tmpdir.join('test.yaml')
     f.write('[')
-    assert main(('--unsafe', f.strpath))
+    assert main(('--unsafe', str(f)))
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,5 +6,5 @@
 @pytest.fixture
 def temp_git_dir(tmpdir):
     git_dir = tmpdir.join('gits')
-    cmd_output('git', 'init', '--', git_dir.strpath)
+    cmd_output('git', 'init', '--', str(git_dir))
     yield git_dir
diff --git a/tests/debug_statement_hook_test.py b/tests/debug_statement_hook_test.py
@@ -33,7 +33,7 @@ def test_finds_breakpoint():
 def test_returns_one_for_failing_file(tmpdir):
     f_py = tmpdir.join('f.py')
     f_py.write('def f():\n    import pdb; pdb.set_trace()')
-    ret = main([f_py.strpath])
+    ret = main([str(f_py)])
     assert ret == 1
 
 
@@ -50,10 +50,10 @@ def test_syntaxerror_file():
 def test_non_utf8_file(tmpdir):
     f_py = tmpdir.join('f.py')
     f_py.write_binary('# -*- coding: cp1252 -*-\nx = "€"\n'.encode('cp1252'))
-    assert main((f_py.strpath,)) == 0
+    assert main((str(f_py),)) == 0
 
 
 def test_py37_breakpoint(tmpdir):
     f_py = tmpdir.join('f.py')
     f_py.write('def f():\n    breakpoint()\n')
-    assert main((f_py.strpath,)) == 1
+    assert main((str(f_py),)) == 1
diff --git a/tests/detect_private_key_test.py b/tests/detect_private_key_test.py
@@ -21,4 +21,4 @@
 def test_main(input_s, expected_retval, tmpdir):
     path = tmpdir.join('file.txt')
     path.write_binary(input_s)
-    assert main([path.strpath]) == expected_retval
+    assert main([str(path)]) == expected_retval
diff --git a/tests/end_of_file_fixer_test.py b/tests/end_of_file_fixer_test.py
@@ -35,7 +35,7 @@ def test_integration(input_s, expected_retval, output, tmpdir):
     path = tmpdir.join('file.txt')
     path.write_binary(input_s)
 
-    ret = main([path.strpath])
+    ret = main([str(path)])
     file_output = path.read_binary()
 
     assert file_output == output
diff --git a/tests/file_contents_sorter_test.py b/tests/file_contents_sorter_test.py
@@ -27,7 +27,7 @@ def test_integration(input_s, expected_retval, output, tmpdir):
     path = tmpdir.join('file.txt')
     path.write_binary(input_s)
 
-    output_retval = main([path.strpath])
+    output_retval = main([str(path)])
 
     assert path.read_binary() == output
     assert output_retval == expected_retval
diff --git a/tests/fix_encoding_pragma_test.py b/tests/fix_encoding_pragma_test.py
@@ -11,7 +11,7 @@ def test_integration_inserting_pragma(tmpdir):
     path = tmpdir.join('foo.py')
     path.write_binary(b'import httplib\n')
 
-    assert main((path.strpath,)) == 1
+    assert main((str(path),)) == 1
 
     assert path.read_binary() == (
         b'# -*- coding: utf-8 -*-\n'
@@ -22,22 +22,22 @@ def test_integration_inserting_pragma(tmpdir):
 def test_integration_ok(tmpdir):
     path = tmpdir.join('foo.py')
     path.write_binary(b'# -*- coding: utf-8 -*-\nx = 1\n')
-    assert main((path.strpath,)) == 0
+    assert main((str(path),)) == 0
 
 
 def test_integration_remove(tmpdir):
     path = tmpdir.join('foo.py')
     path.write_binary(b'# -*- coding: utf-8 -*-\nx = 1\n')
 
-    assert main((path.strpath, '--remove')) == 1
+    assert main((str(path), '--remove')) == 1
 
     assert path.read_binary() == b'x = 1\n'
 
 
 def test_integration_remove_ok(tmpdir):
     path = tmpdir.join('foo.py')
     path.write_binary(b'x = 1\n')
-    assert main((path.strpath, '--remove')) == 0
+    assert main((str(path), '--remove')) == 0
 
 
 @pytest.mark.parametrize(
@@ -140,20 +140,20 @@ def test_integration_alternate_pragma(tmpdir, capsys):
     f.write('x = 1\n')
 
     pragma = '# coding: utf-8'
-    assert main((f.strpath, '--pragma', pragma)) == 1
+    assert main((str(f), '--pragma', pragma)) == 1
     assert f.read() == '# coding: utf-8\nx = 1\n'
     out, _ = capsys.readouterr()
-    assert out == f'Added `# coding: utf-8` to {f.strpath}\n'
+    assert out == f'Added `# coding: utf-8` to {str(f)}\n'
 
 
 def test_crlf_ok(tmpdir):
     f = tmpdir.join('f.py')
     f.write_binary(b'# -*- coding: utf-8 -*-\r\nx = 1\r\n')
-    assert not main((f.strpath,))
+    assert not main((str(f),))
 
 
 def test_crfl_adds(tmpdir):
     f = tmpdir.join('f.py')
     f.write_binary(b'x = 1\r\n')
-    assert main((f.strpath,))
+    assert main((str(f),))
     assert f.read_binary() == b'# -*- coding: utf-8 -*-\r\nx = 1\r\n'
diff --git a/tests/forbid_new_submodules_test.py b/tests/forbid_new_submodules_test.py
@@ -15,7 +15,7 @@ def git_dir_with_git_dir(tmpdir):
         subprocess.check_call(('git', 'init', 'foo'))
         subprocess.check_call(
             ('git', 'commit', '-m', 'init', '--allow-empty', '--no-gpg-sign'),
-            cwd=tmpdir.join('foo').strpath,
+            cwd=str(tmpdir.join('foo')),
         )
         yield
 
diff --git a/tests/mixed_line_ending_test.py b/tests/mixed_line_ending_test.py
diff --git a/tests/pretty_format_json_test.py b/tests/pretty_format_json_test.py
diff --git a/tests/requirements_txt_fixer_test.py b/tests/requirements_txt_fixer_test.py
diff --git a/tests/sort_simple_yaml_test.py b/tests/sort_simple_yaml_test.py
diff --git a/tests/string_fixer_test.py b/tests/string_fixer_test.py
diff --git a/tests/trailing_whitespace_fixer_test.py b/tests/trailing_whitespace_fixer_test.py
