Commit55fd173

authored and

committed

Remove and replace compat.text_type

1 parent768b9ff commit55fd173Copy full SHA for 55fd173

File tree

-13

lines changed

-13

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`
`15`	`15`	`fromgitdb.utils.encodingimport (`
`16`		`-text_type,# @UnusedImport`
`17`	`16`	`force_bytes,# @UnusedImport`
`18`	`17`	`force_text# @UnusedImport`
`19`	`18`	`)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`parse_actor_and_date,`
`25`	`25`	`from_timestamp,`
`26`	`26`	`)`
`27`		`-fromgit.compatimporttext_type`
`28`	`27`
`29`	`28`	`fromtimeimport (`
`30`	`29`	`time,`
`@@ -436,7 +435,7 @@ def _serialize(self, stream):`
`436`	`435`	`write(b"\n")`
`437`	`436`
`438`	`437`	`# write plain bytes, be sure its encoded according to our encoding`
`439`		`-ifisinstance(self.message,text_type):`
	`438`	`+ifisinstance(self.message,str):`
`440`	`439`	`write(self.message.encode(self.encoding))`
`441`	`440`	`else:`
`442`	`441`	`write(self.message)`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`fromstatimportS_ISDIR`
`3`	`3`	`fromgit.compatimport (`
`4`	`4`	`safe_decode,`
`5`		`-defenc,`
`6`		`-text_type`
	`5`	`+defenc`
`7`	`6`	`)`
`8`	`7`
`9`	`8`	`__all__= ('tree_to_stream','tree_entries_from_data','traverse_trees_recursive',`
`@@ -33,7 +32,7 @@ def tree_to_stream(entries, write):`
`33`	`32`	`# hence we must convert to an utf8 string for it to work properly.`
`34`	`33`	`# According to my tests, this is exactly what git does, that is it just`
`35`	`34`	`# takes the input literally, which appears to be utf8 on linux.`
`36`		`-ifisinstance(name,text_type):`
	`35`	`+ifisinstance(name,str):`
`37`	`36`	`name=name.encode(defenc)`
`38`	`37`	`write(b''.join((mode_str,b' ',name,b'\0',binsha)))`
`39`	`38`	`# END for each item`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`handle_process_output`
`16`	`16`	`)`
`17`	`17`	`fromgit.compatimport (`
`18`		`-text_type,`
`19`	`18`	`defenc,`
`20`	`19`	`safe_decode,`
`21`	`20`	`is_win,`
`@@ -476,7 +475,7 @@ def commit(self, rev=None):`
`476`	`475`	:return: ``git.Commit``"""
`477`	`476`	`ifrevisNone:`
`478`	`477`	`returnself.head.commit`
`479`		`-returnself.rev_parse(text_type(rev)+"^0")`
	`478`	`+returnself.rev_parse(str(rev)+"^0")`
`480`	`479`
`481`	`480`	`defiter_trees(self,args,*kwargs):`
`482`	`481`	`""":return: Iterator yielding Tree objects`
`@@ -498,7 +497,7 @@ def tree(self, rev=None):`
`498`	`497`	`operations might have unexpected results."""`
`499`	`498`	`ifrevisNone:`
`500`	`499`	`returnself.head.commit.tree`
`501`		`-returnself.rev_parse(text_type(rev)+"^{tree}")`
	`500`	`+returnself.rev_parse(str(rev)+"^{tree}")`
`502`	`501`
`503`	`502`	`defiter_commits(self,rev=None,paths='',**kwargs):`
`504`	`503`	`"""A list of Commit objects representing the history of a given ref/commit`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`Actor,`
`18`	`18`	`)`
`19`	`19`	`fromgitimportRepo`
`20`		`-fromgit.compatimporttext_type`
`21`	`20`	`fromgit.objects.utilimporttzoffset,utc`
`22`	`21`	`fromgit.repo.funimporttouch`
`23`	`22`	`fromgit.test.libimport (`
`@@ -142,7 +141,7 @@ def test_unicode_actor(self):`
`142`	`141`	`self.assertEqual(len(name),9)`
`143`	`142`	`special=Actor._from_string(u"%s <something@this.com>"%name)`
`144`	`143`	`self.assertEqual(special.name,name)`
`145`		`-assertisinstance(special.name,text_type)`
	`144`	`+assertisinstance(special.name,str)`
`146`	`145`
`147`	`146`	`deftest_traversal(self):`
`148`	`147`	`start=self.rorepo.commit("a4d06724202afccd2b5c54f81bcf2bf26dea7fff")`
`@@ -286,8 +285,8 @@ def test_serialization_unicode_support(self):`
`286`	`285`	`# create a commit with unicode in the message, and the author's name`
`287`	`286`	`# Verify its serialization and deserialization`
`288`	`287`	`cmt=self.rorepo.commit('0.1.6')`
`289`		`-assertisinstance(cmt.message,text_type)# it automatically decodes it as such`
`290`		`-assertisinstance(cmt.author.name,text_type)# same here`
	`288`	`+assertisinstance(cmt.message,str)# it automatically decodes it as such`
	`289`	`+assertisinstance(cmt.author.name,str)# same here`
`291`	`290`
`292`	`291`	`cmt.message=u"üäêèß"`
`293`	`292`	`self.assertEqual(len(cmt.message),5)`

Comments

(0)