NotificationsYou must be signed in to change notification settings
Fork32.1k
Star67.4k

bpo-28806: Improve the netrc library#127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Closed

zhangyangyu wants to merge1 commit intopython:mainfromzhangyangyu:workspace

Closed

bpo-28806: Improve the netrc library#127

zhangyangyu wants to merge1 commit intopython:mainfromzhangyangyu:workspace

Conversation

Copy link

Member

zhangyangyu commentedFeb 16, 2017

No description provided.

Improve netrc library largely

601b3f7

zhangyangyu added the type-featureA feature request or enhancement label

Feb 16, 2017

the-knights-who-say-ni added the CLA signed label

Feb 16, 2017

zhangyangyu force-pushed theworkspace branch from8384aca to601b3f7Compare

February 16, 2017 05:31

Copy link

dmerejkowsky commentedFeb 18, 2017

@zhangyangyu Nice work! I also wrote a tiny patch fornetrc, so maybe you could integrate#123 in your PR as well?

Copy link

MemberAuthor

zhangyangyu commentedFeb 20, 2017•
edited
Loading

@dmerejkowsky I wrote this patch months ago, so I have to spend some time picking it up to see if there is any possibility. Happy to see someone also interested in improving netrc.

Copy link

dmerejkowsky commentedFeb 20, 2017

OK, then. Hopefully our PRs won't conflict with each other, so this not a big deal.

Keep up the good work!

yan12125 mentioned this pull request

Jun 19, 2017

.netrc file: add support for passwords containing spacesytdl-org/youtube-dl#13434

Open

8 tasks

akruis referenced this pull request in stackless-dev/stackless

Sep 5, 2017

merge 3.4-slp (Stackless#127, pickling fixes)

785c16c

akruis referenced this pull request in stackless-dev/stackless

Sep 5, 2017

merge 3.4-slp (Stackless#127, use C-Python pickling)

1a49b66

akruis pushed a commit to akruis/cpython that referenced this pull request

Sep 9, 2017

Issuepython#107: fix the __reduce__/__setstate__ protocol for genera…

8a2d22a

…tor and traceback objects__setstate__ must accept the state returned by __reduce__. This was not the case for generatorand trace-back objects. This commit fixes this. The next commit (merge of issuepython#127) adds the relevant test cases.Additionally amends changelog.txt.https://bitbucket.org/stackless-dev/stackless/issues/107

akruis pushed a commit to akruis/cpython that referenced this pull request

Sep 9, 2017

merge 3.3-slp (Stacklesspython#127, pickling fixes)

9994a00

akruis pushed a commit to akruis/cpython that referenced this pull request

Sep 9, 2017

merge 3.3-slp (Stacklesspython#127, use C-Python pickling)

43b9010

akruis pushed a commit to akruis/cpython that referenced this pull request

Sep 9, 2017

Issuepython#127: Fix pickling and copying of various types. Fix pick…

18a3e59

…ling tests.This change is based on f5f98595c6cc63b from 2.7-slp, but it is heavily modified for Python 3.- Pickle 'callable-iterator' objects correctly. Previously the unpickled object had the type '_stackless._wrap.callable-iterator'.- Fix pickling of 'method-wrapper' objects. Previously pickling them caused a SystemError exception.- Fix copy.copy() for 'callable-iterator', 'method', 'dict_keys', 'dict_values' and 'dict_items' objects. Previously the copied object had the type '_stackless._wrap....'.- Fix Stackless pickling tests. The method StacklessTestCase.dumps() didn't pass the pickle protocol to the pickler.- Remove dead code in prickelpit.c. The code was used in older Stackless versions.

akruis pushed a commit to akruis/cpython that referenced this pull request

Sep 9, 2017

Issuepython#127: use C-Python pickling for 'iterator' and 'callable_…

91712fb

…iterator'Disable the Stackless specific code for pickling 'iterator' and 'callable_iterator' objects. C-Python 3.3 already pickles them.Add tests to ensure, that Stackless can still unpickle old pickles.https://bitbucket.org/stackless-dev/stackless/issues/127

ghost mentioned this pull request

Sep 24, 2017

Improve frame and traceback picklingstackless-dev/stackless#107

Closed

Mariatta added needs rebase and removed needs rebase labels

Oct 9, 2017

akruis pushed a commit to akruis/cpython that referenced this pull request

Oct 10, 2017

Merge 3.5-slp (Stacklesspython#127, pickling fixes)

79de128

akruis pushed a commit to akruis/cpython that referenced this pull request

Oct 10, 2017

Merge 3.5-slp (Stacklesspython#127, use C-Python pickling)

eae6aae

zhangyangyu added the awaiting review label

Jan 18, 2018

jjjake mentioned this pull request

Mar 14, 2018

Feature: Auth should use .netrc instead of a .cfgjjjake/internetarchive#154

Closed

raspy reviewed

Apr 17, 2018

View reviewed changes

Lib/netrc.py

		elif tt == 'login' or tt == 'user':
		login = lexer.get_token()
		elif tt == 'account':
		account = lexer.get_token()
		elif tt == 'password':
		if os.name == 'posix' and default_netrc:
		if os.name == 'posix' and default_netrc and login != "anonymous":

Copy link

raspyApr 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This assumes that login has already been parsed, but the netrc format does not require providing login token before password token. It would be better to perform this check on storing parsed data into self.hosts[entryname], when all machine-related data is parsed and available.

auvipy reviewed

Oct 9, 2018

View reviewed changes

Copy link

auvipy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

also please re base

Doc/library/netrc.rst

		@@ -32,6 +32,12 @@ the Unix :program:`ftp` program and other FTP clients.

		.. versionchanged:: 3.4 Added the POSIX permission check.

		.. versionchanged:: 3.7

Copy link

auvipyOct 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

3.8

Copy link

auvipySep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

you can retarget it for python 3.9

chrahunt mentioned this pull request

Oct 27, 2018

Support credentials in configuration for private PyPIpypa/pip#4315

Closed

serhiy-storchaka reviewed

Oct 29, 2018

View reviewed changes

Copy link

Member

serhiy-storchaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I'm not sure, but it may be worth to backport these changes to maintained versions. It fixes several bugs in the.netrc file parsing.

Doc/library/netrc.rst

		@@ -32,6 +32,12 @@ the Unix :program:`ftp` program and other FTP clients.

		.. versionchanged:: 3.4 Added the POSIX permission check.

		.. versionchanged:: 3.7

Copy link

Member

serhiy-storchakaApr 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

3.8

Lib/netrc.py

		continue
		if ch == "\"":
		for ch in fiter:
		if ch != "\"":

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I would revert this condition.

ifch=='"':returntoken

And removedcontinue.

Lib/netrc.py

		self.lineno = 1
		self.instream = fp
		self.whitespace = "\n\t\r "
		self._stack = []

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

It is not a stack, it is a queue. I suggest to rename it topushback, as inshlex.lexer.

Lib/netrc.py

		for ch in fiter:
		if ch in self.whitespace:
		continue
		if ch == "\"":

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

'"'?

Lib/netrc.py

		ch = self._read_char()
		token += ch
		for ch in fiter:
		if ch not in self.whitespace:

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

The same as above.

Lib/netrc.py

		lexer.instream.readline()
		continue
		elif tt == 'machine':
		entryname = lexer.get_token()
		elif tt == 'default':
		entryname = 'default'
		elif tt == 'macdef': # Just skip to end of macdefs
		elif tt == 'macdef':
		entryname = lexer.get_token()

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

You need to read and ignore the rest of the line after the macro name.

Lib/netrc.py

		raise NetrcParseError(
		"Macro definition missing null line terminator.",
		file, lexer.lineno)
		if line == '\n':

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Add a comment.

Lib/netrc.py

		@@ -127,10 +172,10 @@ def __repr__(self):
		rep = ""
		for host in self.hosts.keys():
		attrs = self.hosts[host]
		rep = rep + "machine "+ host + "\n\tlogin " +repr(attrs[0]) + "\n"
		rep = rep + "machine "+ host + "\n\tlogin " + attrs[0] + "\n"

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Perhaps we need a special function which escapes whitespaces and other special characters?

Lib/netrc.py

		ch = self._read_char()
		token += ch
		for ch in fiter:
		if ch not in self.whitespace:

Copy link

Member

serhiy-storchakaOct 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I suggest to add a flag for denoting whether the terminating whitespace was'\n'. It will be helpful for comments andmacdef.

Copy link

Contributor

csabella commentedMay 20, 2019

@zhangyangyu, would you be able to address Serhiy's review from October? Thanks!

Copy link

MemberAuthor

zhangyangyu commentedMay 20, 2019

@csabella I am busy in my job now and this issue has been a long time even myself needs to reacquaint with it. But October seems not that hard to me. Is 3.8 going to release on October?

Copy link

Contributor

csabella commentedMay 31, 2019

@zhangyangyu, sorry, I meant that Serhiy had left a comment last October, not that this needs to be looked at before the next October. The cutoff for 3.8 is this coming Monday (2019-06-03). I hope you still find time to look at it in the next few months. Thanks!

Copy link

Contributor

eamanu commentedSep 18, 2019

Hello I can continue this PR if your consider good.

Cc@csabella

jayvdb mentioned this pull request

Jan 7, 2020

Store token in a dotfilefridex/githubcap#9

Open

Copy link

Contributor

eamanu commentedJun 21, 2020

Hi@auvipy @csabella @zhangyangyu There is some plan with this PR?
Was open 3 years ago. If the author is still interested on this bugs
resolution we could open a new PR.

What's your opinion?