Skip to content

[3.6] bpo-31583: Fix 2to3 for using with --add-suffix option (GH-3758)#6529

Merged
ambv merged 1 commit into
python:3.6from
miss-islington:backport-e3a523a-3.6
Apr 19, 2018
Merged

[3.6] bpo-31583: Fix 2to3 for using with --add-suffix option (GH-3758)#6529
ambv merged 1 commit into
python:3.6from
miss-islington:backport-e3a523a-3.6

Conversation

@miss-islington

@miss-islington miss-islington commented Apr 18, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

(cherry picked from commit e3a523a)

Co-authored-by: Denis Osipov osipov_d@list.ru

https://bugs.python.org/issue31583

@denis-osipov @miss-islington
bpo-31583: Fix 2to3 for using with --add-suffix option (pythonGH-3758)
8cb083a 
(cherry picked from commit e3a523a)

Co-authored-by: Denis Osipov <osipov_d@list.ru>
@bedevere-bot bedevere-bot mentioned this pull request Apr 18, 2018
Merged
@ambv

ambv commented Apr 19, 2018

Copy link
Copy Markdown
Contributor

Hm. The failure on Travis is unrelated:

======================================================================
ERROR: test_ignore (test.test_multiprocessing_forkserver.TestIgnoreEINTR)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/python/cpython/Lib/test/_test_multiprocessing.py", line 4050, in test_ignore
    os.kill(p.pid, signal.SIGUSR1)
ProcessLookupError: [Errno 3] No such process

@miss-islington

miss-islington commented Apr 19, 2018

Copy link
Copy Markdown
Contributor Author

@denis-osipov and @ambv: Backport status check is done, and it's a failure ❌ .

@miss-islington

miss-islington commented Apr 19, 2018

Copy link
Copy Markdown
Contributor Author

@denis-osipov and @ambv: Backport status check is done, and it's a success ✅ .

1 similar comment
@miss-islington

miss-islington commented Apr 19, 2018

Copy link
Copy Markdown
Contributor Author

@denis-osipov and @ambv: Backport status check is done, and it's a success ✅ .

@ambv ambv merged commit 1957e7b into python:3.6 Apr 19, 2018
@miss-islington

miss-islington commented Apr 19, 2018

Copy link
Copy Markdown
Contributor Author

Thanks, @ambv!

@miss-islington miss-islington deleted the backport-e3a523a-3.6 branch April 19, 2018 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@miss-islington @ambv @the-knights-who-say-ni @bedevere-bot @denis-osipov