Commit69ca329

committed

Fix flake8 errors

1 parent9c6209f commit69ca329Copy full SHA for 69ca329

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,8 @@ def unmerged_blobs(self):`
`463`	`463`	`forstage,blobinself.iter_blobs(is_unmerged_blob):`
`464`	`464`	`path_map.setdefault(blob.path, []).append((stage,blob))`
`465`	`465`	`# END for each unmerged blob`
`466`		`-forlinpath_map.values():`
`467`		`-l.sort()`
	`466`	`+forlineinpath_map.values():`
	`467`	`+line.sort()`
`468`	`468`	`returnpath_map`
`469`	`469`
`470`	`470`	`@classmethod`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ def delete(cls, repo, path):`
`466`	`466`	`# write-binary is required, otherwise windows will`
`467`	`467`	`# open the file in text mode and change LF to CRLF !`
`468`	`468`	`withopen(pack_file_path,'wb')asfd:`
`469`		`-fd.writelines(l.encode(defenc)forlinnew_lines)`
	`469`	`+fd.writelines(line.encode(defenc)forlineinnew_lines)`
`470`	`470`
`471`	`471`	`except (OSError,IOError):`
`472`	`472`	`pass# it didn't exist at all`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`686`	`686`
`687`	`687`	`# read head information`
`688`	`688`	`withopen(osp.join(self.repo.common_dir,'FETCH_HEAD'),'rb')asfp:`
`689`		`-fetch_head_info= [l.decode(defenc)forlinfp.readlines()]`
	`689`	`+fetch_head_info= [line.decode(defenc)forlineinfp.readlines()]`
`690`	`690`
`691`	`691`	`l_fil=len(fetch_info_lines)`
`692`	`692`	`l_fhi=len(fetch_head_info)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ def test_index_file_from_tree(self, rw_repo):`
`212`	`212`	`assertunmerged_blob_map`
`213`	`213`
`214`	`214`	`# pick the first blob at the first stage we find and use it as resolved version`
`215`		`-three_way_index.resolve_blobs(l[0][1]forlinunmerged_blob_map.values())`
	`215`	`+three_way_index.resolve_blobs(line[0][1]forlineinunmerged_blob_map.values())`
`216`	`216`	`tree=three_way_index.write_tree()`
`217`	`217`	`assertisinstance(tree,Tree)`
`218`	`218`	`num_blobs=0`

Comments

(0)