Commit9e749aa

authored

Merge pull requestsigmavirus24#964 from dmerejkowsky/dm/3.8

Fix deprecation warning for 3.7 and up

2 parents043d61f +3c3ad20 commit9e749aaCopy full SHA for 9e749aa

File tree

+24

-7

lines changed

+24

-7

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -181,4 +181,6 @@ Contributors`
`181`	`181`
`182`	`182`	`- Steven Nyman (@stevennyman)`
`183`	`183`
`184`		`-- Tigran Tchougourian (@NargiT)`
	`184`	`+- Tigran Tchougourian (@NargiT)`
	`185`	`+`
	`186`	`+- Dimitri Merejkowsky (@dmerejkowsky)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ Guidelines for Contributing to github3.py`
`56`	`56`
`57`	`57`	`#. Please followpep-0008_. Feel free to also useflake8_ to help.`
`58`	`58`
	`59`	`+#. Import modules, not class or functions`
	`60`	`+`
`59`	`61`	`.. links`
`60`	`62`	`.. _README:./README.rst`
`61`	`63`	`.. _easy:https://github.com/sigmavirus24/github3.py/issues?labels=Easy&page=1&state=open`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`	`"""Module containing session and auth logic."""`
`3`		`-fromcollectionsimportCallable`
	`3`	`+try:`
	`4`	`+importcollections.abcasabc_collections`
	`5`	`+exceptImportError:`
	`6`	`+# For Python 2.7 compatibility`
	`7`	`+importcollectionsasabc_collections`
	`8`	`+`
`4`	`9`	`importdatetime`
`5`	`10`	`fromcontextlibimportcontextmanager`
`6`	`11`	`fromloggingimportgetLogger`
`@@ -193,7 +198,7 @@ def two_factor_auth_callback(self, callback):`
`193`	`198`	`ifnotcallback:`
`194`	`199`	`return`
`195`	`200`
`196`		`-ifnotisinstance(callback,Callable):`
	`201`	`+ifnotisinstance(callback,abc_collections.Callable):`
`197`	`202`	`raiseValueError("Your callback should be callable")`
`198`	`203`
`199`	`204`	`self.two_factor_auth_cb=callback`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`		`-importcollections`
	`2`	`+try:`
	`3`	`+importcollections.abcasabc_collections`
	`4`	`+exceptImportError:`
	`5`	`+# For Python 2.7 compatibility`
	`6`	`+importcollectionsasabc_collections`
`3`	`7`	`importfunctools`
`4`	`8`
`5`	`9`	`fromrequests.compatimporturlparse,urlencode`
`@@ -8,7 +12,7 @@`
`8`	`12`	`from .importmodels`
`9`	`13`
`10`	`14`
`11`		`-classGitHubIterator(models.GitHubCore,collections.Iterator):`
	`15`	`+classGitHubIterator(models.GitHubCore,abc_collections.Iterator):`
`12`	`16`	"""The :class:`GitHubIterator` class powers all of the iter_* methods."""
`13`	`17`
`14`	`18`	`def__init__(`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`	`"""A collection of useful utilities."""`
`3`		`-importcollections`
	`3`	`+try:`
	`4`	`+importcollections.abcasabc_collections`
	`5`	`+exceptImportError:`
	`6`	`+# For Python 2.7 compatibility`
	`7`	`+importcollectionsasabc_collections`
`4`	`8`	`importdatetime`
`5`	`9`	`importre`
`6`	`10`
`@@ -68,7 +72,7 @@ def stream_response_to_file(response, path=None):`
`68`	`72`	`fd=None`
`69`	`73`	`filename=None`
`70`	`74`	`ifpath:`
`71`		`-ifisinstance(getattr(path,"write",None),collections.Callable):`
	`75`	`+ifisinstance(getattr(path,"write",None),abc_collections.Callable):`
`72`	`76`	`pre_opened=True`
`73`	`77`	`fd=path`
`74`	`78`	`filename=getattr(fd,"name",None)`

Comments

(0)