Commit6bdaa46

committed

Drop dependency on six

1 parent1875885 commit6bdaa46Copy full SHA for 6bdaa46

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`# flake8: noqa`
`9`	`9`
`10`	`10`	`importsys`
`11`		`-importsix`
`12`	`11`
`13`	`12`	`fromgitdb.utils.compatimport (`
`14`	`13`	`PY3,`
`@@ -34,6 +33,7 @@ def bchr(n):`
`34`	`33`	`returnbytes([n])`
`35`	`34`	`defmviter(d):`
`36`	`35`	`returnd.values()`
	`36`	`+range=xrange`
`37`	`37`	`unicode=str`
`38`	`38`	`else:`
`39`	`39`	`FileType=file`
`@@ -44,6 +44,7 @@ def mviter(d):`
`44`	`44`	`byte_ord=ord`
`45`	`45`	`bchr=chr`
`46`	`46`	`unicode=unicode`
	`47`	`+range=xrange`
`47`	`48`	`defmviter(d):`
`48`	`49`	`returnd.itervalues()`
`49`	`50`
`@@ -52,9 +53,9 @@ def mviter(d):`
`52`	`53`
`53`	`54`	`defsafe_decode(s):`
`54`	`55`	`"""Safely decodes a binary string to unicode"""`
`55`		`-ifisinstance(s,six.text_type):`
	`56`	`+ifisinstance(s,unicode):`
`56`	`57`	`returns`
`57`		`-elifisinstance(s,six.binary_type):`
	`58`	`+elifisinstance(s,bytes):`
`58`	`59`	`ifPRE_PY27:`
`59`	`60`	# Python 2.6 does not support the `errors` argument, so we cannot
`60`	`61`	`# control the replacement of unsafe chars in it.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@`
`54`	`54`	`defenc,`
`55`	`55`	`PY3,`
`56`	`56`	`safe_decode,`
	`57`	`+range,`
`57`	`58`	`)`
`58`	`59`
`59`	`60`	`importos`
`60`	`61`	`importsys`
`61`	`62`	`importre`
`62`		`-fromsix.movesimportrange`
`63`	`63`
`64`	`64`	`DefaultDBType=GitCmdObjectDB`
`65`	`65`	`ifsys.version_info[:2]< (2,5):# python 2.4 compatiblity`

Comments

(0)