Commit722473e

committed

Remove Python 2.6 hack

Since support was dropped.

1 parent28afef5 commit722473eCopy full SHA for 722473e

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,20 +48,13 @@ def mviter(d):`
`48`	`48`	`defmviter(d):`
`49`	`49`	`returnd.itervalues()`
`50`	`50`
`51`		`-PRE_PY27=sys.version_info< (2,7)`
`52`		`-`
`53`	`51`
`54`	`52`	`defsafe_decode(s):`
`55`	`53`	`"""Safely decodes a binary string to unicode"""`
`56`	`54`	`ifisinstance(s,unicode):`
`57`	`55`	`returns`
`58`	`56`	`elifisinstance(s,bytes):`
`59`		`-ifPRE_PY27:`
`60`		-# Python 2.6 does not support the `errors` argument, so we cannot
`61`		`-# control the replacement of unsafe chars in it.`
`62`		`-returns.decode(defenc)`
`63`		`-else:`
`64`		`-returns.decode(defenc,errors='replace')`
	`57`	`+returns.decode(defenc,errors='replace')`
`65`	`58`	`raiseTypeError('Expected bytes or text, but got %r'% (s,))`
`66`	`59`
`67`	`60`

Comments

(0)