8000 bpo-38347: find Python scripts whose name contain a '-' by rpluem · Pull Request #16536 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-38347: find Python scripts whose name contain a '-' #16536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Oct 11, 2019
Merged

bpo-38347: find Python scripts whose name contain a '-' #16536

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
94047a5
bpo-38347: find Python scripts whose name contain a '-'
rpluem Oct 2, 2019
d8e988e
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 2, 2019
7ca16a2
bpo-38347: assume all files that end on '.py' are Python scripts
rpluem Oct 2, 2019
9c512f4
bpo-38347: add a test case for the recursive search
rpluem Oct 2, 2019
b1fa966
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 2, 2019
2dcdef4
bpo-38347: use os.sep instead of the Unix specific '/'
rpluem Oct 2, 2019
07f7158
bpo-38347: rename variable target_file to filename
rpluem Oct 4, 2019
14f5aa0
bpo-38347: remove unneeded NEWS entry
rpluem Oct 4, 2019
a68ad42
bpo-38347: adjust comment to refelct recent changes
rpluem Oct 4, 2019
05c39a5
bpo-38347: forgot to mention pathfix.py
rpluem Oct 4, 2019
eec25ce
Revert "bpo-38347: rename variable target_file to filename"
rpluem Oct 8, 2019
a1be155
Revert "bpo-38347: use os.sep instead of the Unix specific '/'"
rpluem Oct 8, 2019
7e606dd
Revert "bpo-38347: add a test case for the recursive search"
rpluem Oct 8, 2019
92384a5
bpo-38347: add a test case for the recursive search
rpluem Oct 8, 2019
9e29237
bpo-38347: Use local variables with better names
rpluem Oct 10, 2019
a174102
bpo-38347: move NEWS to the correct location
rpluem Oct 10, 2019
95e7a2b
bpo-38347: Use double quotes instead of single ones
rpluem Oct 10, 2019
56eaa94
bpo-38347: Add comment to explain the name of the script
rpluem Oct 11, 2019
bbab2b4
Fix typo
rpluem Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bpo-38347: Use local variables with better names 
Use local variables with better names instead of class attributes.
  • Loading branch information
@rpluem
rpluem committed Oct 10, 2019
commit 9e292375387c817853b4202f1693cc0c1c938f7e
34 changes: 17 additions & 17 deletions Lib/test/test_tools/test_pathfix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,32 @@ class TestPathfixFunctional(unittest.TestCase):
script = os.path.join(scriptsdir, 'pathfix.py')

def setUp(self):
self.temp_file = support.TESTFN
self.addCleanup(support.unlink, support.TESTFN)

def pathfix(self, shebang, pathfix_flags, exitcode=0, stdout='', stderr='',
filename=''):
if filename == '':
filename = self.temp_file

with open(self.temp_file, 'w', encoding='utf8') as f:
directory=''):
if directory:
filename = os.path.join(directory, 'script-A_1.py')
pathfix_arg = directory
else:
filename = support.TESTFN
pathfix_arg = filename

with open(filename, 'w', encoding='utf8') as f:
f.write(f'{shebang}\n' + 'print("Hello world")\n')

proc = subprocess.run(
[sys.executable, self.script,
*pathfix_flags, '-n', filename],
*pathfix_flags, '-n', pathfix_arg],
capture_output=True, text=1)

if stdout == '' and proc.returncode == 0:
stdout = f'{self.temp_file}: updating\n'
stdout = f'{filename}: updating\n'
self.assertEqual(proc.returncode, exitcode, proc)
self.assertEqual(proc.stdout, stdout, proc)
self.assertEqual(proc.stderr, stderr, proc)

with open(self.temp_file, 'r', encoding='utf8') as f:
with open(filename, 'r', encoding='utf8') as f:
output = f.read()

lines = output.split('\n')
Expand All @@ -49,18 +52,15 @@ def pathfix(self, shebang, pathfix_flags, exitcode=0, stdout='', stderr='',
return new_shebang

def test_recursive(self):
self.temp_directory = support.TESTFN + '.d'
self.addCleanup(support.rmtree, self.temp_directory)
os.mkdir(self.temp_directory)
self.temp_file = self.temp_directory + os.sep + \
os.path.basename(support.TESTFN) + '-t.py'
temp_directory_basename = os.path.basename(self.temp_directory)
expected_stderr = f'recursedown(\'{temp_directory_basename}\')\n'
tmpdir = support.TESTFN + '.d'
self.addCleanup(support.rmtree, tmpdir)
os.mkdir(tmpdir)
expected_stderr = f'recursedown(\'{os.path.basename(tmpdir)}\')\n'
self.assertEqual(
self.pathfix(
'#! /usr/bin/env python',
['-i', '/usr/bin/python3'],
filename=self.temp_directory,
directory=tmpdir,
stderr=expected_stderr),
'#! /usr/bin/python3')

Expand Down
0