Re: [PATCH v5 04/15] git-p4: change the expansion test from basestring to list

"Ben Keene via GitGitGadget" <gitgitgadget@gmail.com> writes:

s/literal/a &/, probably, but I do not thin this is about "literal" at all. Perhaps "if a list or a string was passed ..." is what you meant, as the code seems to have two ways to represent a command line in the program, one as a single string with possibly multiple tokens on it, separated with IFS and quoted just like you would feed to shell, and the other as a list of strings, each element being a single argv[] element for the command to be invoked.

So the issue is that isinstance(X, basestring) used to be how you are supposed to see if X is a "string", and the logic were built around "if we have a string, then keep the command in a string when manipulating, and otherwise what we have must be a command line in a list". But because Unicode string is not an instance of basestring, the logic no longer work, so you'd flip the polarity around to use "if it is not a list, then we must have a command in a string".

Which makes sense.

This is mostly true, but the use in p4_build_cmd() and the second use among the two uses in p4CmdList() are different.

	Some codepaths can represent a command line the program
	internally prepares to execute either as a single string
	(i.e. each token properly quoted, concatenated with $IFS) or
	as a list of argv[] elements, and there are 9 places where
	we say "if X is isinstance(_, basestring), then do this
	thing to handle X as a command line in a single string; if
	not, X is a command line in a list form".

	This does not work well with Python 3, as there is no
	basestring (everything is Unicode now), and even with Python
	2, it was not an ideal way to tell the two cases apart,
	because an internally formed command line could have been in
	a single Unicode string.

	Flip the check to say "if X is not a list, then handle X as
	a command line in a single string; otherwise treat it as a
	command line in a list form".

	This will get rid of references to 'basestring', to migrate
	the code ready for Python 3.

or something like that?