Commit629fd87

committed

Fix how version_info omits non-numeric fields

For#1833.This makes version_info parsing stop including fields after thefirst non-numeric field, rather than skipping non-numeric fieldsand including subsequent numeric fields that then wrongly appear tohave the original position and significance of the dropped field.This actually stops at (rather than merely after) a non-numericfield, i.e., potentially parseable fields that are not fullynumeric, such as "2a", are stopped at, rather than parsed as "2".

1 parentac20325 commit629fd87Copy full SHA for 629fd87

File tree

1 file changed

-1

lines changed

git
- cmd.py

1 file changed

-1

lines changed

`‎git/cmd.py‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`importre`
`9`	`9`	`importcontextlib`
`10`	`10`	`importio`
	`11`	`+importitertools`
`11`	`12`	`importlogging`
`12`	`13`	`importos`
`13`	`14`	`importsignal`
`@@ -850,7 +851,8 @@ def version_info(self) -> Tuple[int, ...]:`
`850`	`851`	`process_version=self._call_process("version")`
`851`	`852`	`version_string=process_version.split(" ")[2]`
`852`	`853`	`version_fields=version_string.split(".")[:4]`
`853`		`-self._version_info=tuple(int(n)forninversion_fieldsifn.isdigit())`
	`854`	`+leading_numeric_fields=itertools.takewhile(str.isdigit,version_fields)`
	`855`	`+self._version_info=tuple(map(int,leading_numeric_fields))`
`854`	`856`
`855`	`857`	`# This value will be considered valid until the next refresh.`
`856`	`858`	`self._version_info_token=refresh_token`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit629fd87

File tree

1 file changed

1 file changed

`‎git/cmd.py‎`

0 commit comments