Commit a561c4829f3629456de3315f6c0e151ad1b555b2 - Falderal

For #2, new dev branch, write test, apply patch from @j4james. Chris Pressey 3 years ago

4 changed file(s) with 21 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all

-0

HISTORY.markdown less more

0	0	History
1	1	=======
	2
	3	Version 0.12 "Schoenhofen Brewery" (current development version):
	4
	5	* When expanding variables in declaration strings, use
	6	`string.replace` instead of `re.sub` so that backslash-escaping
	7	is not perfomed on the replacement string. (Thanks to
	8	James Holderness for bug report and patch.)
2	9
3	10	Version 0.11 "Dan Ryan Expressway" (current released version):
4	11

-5

src/falderal/objects.py less more

772	772	file.close()
773	773	os.close(fd)
774	774	# replace all occurrences in command
775		command = re.sub(r'\%\(test-body-file\)', test_filename, command)
	775	command = command.replace('%(test-body-file)', test_filename)
776	776	command_contained_test_body_file = True
777	777
778	778	if '%(test-body-text)' in self.command:
779	779	# escape all single quotes in body
780	780	body = re.sub(r"'", r"\'", body)
781	781	# replace all occurrences in command
782		command = re.sub(r'\%\(test-body-text\)', body, command)
	782	command = command.replace('%(test-body-text)', body)
783	783	command_contained_test_body_text = True
784	784
785	785	if '%(test-input-file)' in self.command:

791	791	file.close()
792	792	os.close(fd)
793	793	# replace all occurrences in command
794		command = re.sub(r'\%\(test-input-file\)', test_input_filename, command)
	794	command = command.replace('%(test-input-file)', test_input_filename)
795	795	command_contained_test_input_file = True
796	796
797	797	if '%(test-input-text)' in self.command:
798	798	# escape all single quotes in input
799	799	body = re.sub(r"'", r"\'", body)
800	800	# replace all occurrences in command
801		command = re.sub(r'\%\(test-input-text\)', input, command)
	801	command = command.replace('%(test-input-text)', input)
802	802	command_contained_test_input_text = True
803	803
804	804	if '%(output-file)' in self.command:

806	806	fd, output_filename = mkstemp()
807	807	os.close(fd)
808	808	# replace all occurrences in command
809		command = re.sub(r'\%\(output-file\)', output_filename, command)
	809	command = command.replace('%(output-file)', output_filename)
810	810
811	811	# subshell the command and return the output
812	812	pipe = Popen(command, shell=True,

-1

tests/test-var-subst-no-eol.expected less more

0	0	--------------------------------
1		Total test runs: 10, failures: 0
	1	Total test runs: 11, failures: 0
2	2	--------------------------------

-0

tests/test-var-subst-no-eol.markdown less more

31	31	\| hi
32	32	= hi
33	33	= hi
	34
	35	Note that when variables are expanded, backslash sequences in the
	36	replacement string ("\n", etc) are not expanded.
	37
	38	-> Tests for functionality "Echo"
	39
	40	\| he\nl\tl\\o
	41	= he\nl\tl\\o
34	42
35	43	Note that single quotes needn't be supplied around `%(test-body-file)`
36	44	or `%(output-file)`.