Commit438d3e6

authored and

committed

Remove and replace compat.FileType

1 parentd01f072 commit438d3e6Copy full SHA for 438d3e6

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,6 @@`
`33`	`33`	`defenc=sys.getfilesystemencoding()`
`34`	`34`
`35`	`35`	`ifPY3:`
`36`		`-importio`
`37`		`-FileType=io.IOBase`
`38`		`-`
`39`	`36`	`defbyte_ord(b):`
`40`	`37`	`returnb`
`41`	`38`
`@@ -49,9 +46,6 @@ def mviter(d):`
`49`	`46`	`unicode=str`
`50`	`47`	`binary_type=bytes`
`51`	`48`	`else:`
`52`		`-FileType=file# @UndefinedVariable on PY3`
`53`		`-# usually, this is just ascii, which might not enough for our encoding needs`
`54`		`-# Unless it's set specifically, we override it to be utf-8`
`55`	`49`	`ifdefenc=='ascii':`
`56`	`50`	`defenc='utf-8'`
`57`	`51`	`byte_ord=ord`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`	`importabc`
`10`	`10`	`fromfunctoolsimportwraps`
`11`	`11`	`importinspect`
	`12`	`+fromioimportIOBase`
`12`	`13`	`importlogging`
`13`	`14`	`importos`
`14`	`15`	`importre`
`15`	`16`	`fromcollectionsimportOrderedDict`
`16`	`17`
`17`	`18`	`fromgit.compatimport (`
`18`	`19`	`string_types,`
`19`		`-FileType,`
`20`	`20`	`defenc,`
`21`	`21`	`force_text,`
`22`	`22`	`with_metaclass,`
`@@ -581,7 +581,7 @@ def write(self):`
`581`	`581`	`fp=self._file_or_files`
`582`	`582`
`583`	`583`	`# we have a physical file on disk, so get a lock`
`584`		`-is_file_lock=isinstance(fp,string_types+ (FileType, ))`
	`584`	`+is_file_lock=isinstance(fp,string_types+ (IOBase, ))`
`585`	`585`	`ifis_file_lock:`
`586`	`586`	`self._lock._obtain_lock()`
`587`	`587`	`ifnothasattr(fp,"seek"):`

Comments

(0)