Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

bpo-34108: Fix double carriage return in 2to3 on Windows #8271

Merged
merged 3 commits into from
Jul 13, 2018
Merged

bpo-34108: Fix double carriage return in 2to3 on Windows #8271

merged 3 commits into from
Jul 13, 2018

Conversation

jaraco
Copy link
Member

@jaraco jaraco commented Jul 13, 2018 •
edited by bedevere-bot
Loading

@jaraco
Copy link
Member Author

jaraco commented Jul 13, 2018

We can see in the VSTS run on Windows before the fix is applied:

2018-07-13T12:54:49.8119753Z ======================================================================
2018-07-13T12:54:49.8120135Z FAIL: test_crlf_unchanged (lib2to3.tests.test_refactor.TestRefactoringTool)
2018-07-13T12:54:49.8120356Z ----------------------------------------------------------------------
2018-07-13T12:54:49.8120535Z Traceback (most recent call last):
2018-07-13T12:54:49.8120751Z   File "D:\a\1\s\lib\lib2to3\tests\test_refactor.py", line 303, in test_crlf_unchanged
2018-07-13T12:54:49.8120964Z     self.assertNotIn(b"\r\r\n", new)
2018-07-13T12:54:49.8121205Z AssertionError: b'\r\r\n' unexpectedly found in b'print("hi")\r\r\n\r\r\nprint("Like bad Windows newlines?")\r\r\n'
2018-07-13T12:54:49.8121353Z 
2018-07-13T12:54:49.8121528Z ----------------------------------------------------------------------

@jaraco jaraco merged commit cafaf04 into python:master Jul 13, 2018
@miss-islington
Copy link
Contributor

Thanks @jaraco for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link

@jaraco: Please replace # with GH- in the commit message next time. Thanks!

@jaraco jaraco deleted the issue-34108 branch July 13, 2018 15:26
@bedevere-bot
Copy link

GH-8275 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 13, 2018
@jaraco @miss-islington
bpo-34108: Fix double carriage return in 2to3 on Windows (pythonGH-8271)
ef7e06d 
* Add test capturing failure.
* Honor newlines as present in the original file.
(cherry picked from commit cafaf04)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
@aaronang aaronang mentioned this pull request Jul 13, 2018
Closed
jaraco added a commit that referenced this pull request Jul 13, 2018
@miss-islington @jaraco
bpo-34108: Fix double carriage return in 2to3 on Windows (GH-8271) (#…
cf21d00 
…8275)

* Add test capturing failure.
* Honor newlines as present in the original file.
(cherry picked from commit cafaf04)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
CuriousLearner added a commit to CuriousLearner/cpython that referenced this pull request Jul 14, 2018
@CuriousLearner
Merge branch 'master' into bitwise_docs
11c1706 
* master: (2633 commits)
  bpo-34087: Fix buffer overflow in int(s) and similar functions (pythonGH-8274)
  bpo-34108: Fix double carriage return in 2to3 on Windows (python#8271)
  bpo-4260: Document that ctypes.xFUNCTYPE are decorators (pythonGH-7924)
  bpo-33723: Fix test_time.test_thread_time() (pythonGH-8267)
  bpo-33967: Remove use of deprecated assertRaisesRegexp() (pythonGH-8261)
  bpo-34080: Fix a memory leak in the compiler. (pythonGH-8222)
  Enable GUI testing on Travis Linux builds via Xvfb (pythonGH-7887)
  bpo-23927: Make getargs.c skipitem() skipping 'w*'. (pythonGH-8192)
  bpo-33648: Remove PY_WARN_ON_C_LOCALE (pythonGH-7114)
  bpo-34092, test_logging: increase SMTPHandlerTest timeout (pythonGH-8245)
  Simplify __all__ in multiprocessing (pythonGH-6856)
  bpo-34083: Update dict order in Functional HOWTO (pythonGH-8230)
  Doc: Point to Simple statements section instead of PEP (pythonGH-8238)
  bpo-29442: Replace optparse with argparse in setup.py (pythonGH-139)
  bpo-33597: Add What's New for PyGC_Head (pythonGH-8236)
  Dataclasses: Fix example on 30.6.8, add method should receive a list rather than an integer. (pythonGH-8038)
  Fix documentation for input and output tutorial (pythonGH-8231)
  bpo-34009: Expand on platform support changes (pythonGH-8022)
  Factor-out two substantially identical code blocks. (pythonGH-8219)
  bpo-34031: fix incorrect usage of self.fail in two tests (pythonGH-8091)
  ...
CuriousLearner added a commit to CuriousLearner/cpython that referenced this pull request Jul 15, 2018
@CuriousLearner
Merge branch 'master' into fix-issue8525
fdc3a3d 
* master: (1159 commits)
  bpo-34087: Fix buffer overflow in int(s) and similar functions (pythonGH-8274)
  bpo-34108: Fix double carriage return in 2to3 on Windows (python#8271)
  bpo-4260: Document that ctypes.xFUNCTYPE are decorators (pythonGH-7924)
  bpo-33723: Fix test_time.test_thread_time() (pythonGH-8267)
  bpo-33967: Remove use of deprecated assertRaisesRegexp() (pythonGH-8261)
  bpo-34080: Fix a memory leak in the compiler. (pythonGH-8222)
  Enable GUI testing on Travis Linux builds via Xvfb (pythonGH-7887)
  bpo-23927: Make getargs.c skipitem() skipping 'w*'. (pythonGH-8192)
  bpo-33648: Remove PY_WARN_ON_C_LOCALE (pythonGH-7114)
  bpo-34092, test_logging: increase SMTPHandlerTest timeout (pythonGH-8245)
  Simplify __all__ in multiprocessing (pythonGH-6856)
  bpo-34083: Update dict order in Functional HOWTO (pythonGH-8230)
  Doc: Point to Simple statements section instead of PEP (pythonGH-8238)
  bpo-29442: Replace optparse with argparse in setup.py (pythonGH-139)
  bpo-33597: Add What's New for PyGC_Head (pythonGH-8236)
  Dataclasses: Fix example on 30.6.8, add method should receive a list rather than an integer. (pythonGH-8038)
  Fix documentation for input and output tutorial (pythonGH-8231)
  bpo-34009: Expand on platform support changes (pythonGH-8022)
  Factor-out two substantially identical code blocks. (pythonGH-8219)
  bpo-34031: fix incorrect usage of self.fail in two tests (pythonGH-8091)
  ...
@cgohlke cgohlke mentioned this pull request Jul 21, 2018
Closed
CuriousLearner added a commit to CuriousLearner/cpython that referenced this pull request Jul 21, 2018
@CuriousLearner
Merge branch 'master' of github.com:CuriousLearner/cpython into fix-i…
7b039a0 
…ssue-33014

* 'master' of github.com:CuriousLearner/cpython: (722 commits)
  bpo-34087: Fix buffer overflow in int(s) and similar functions (pythonGH-8274)
  bpo-34108: Fix double carriage return in 2to3 on Windows (python#8271)
  bpo-4260: Document that ctypes.xFUNCTYPE are decorators (pythonGH-7924)
  bpo-33723: Fix test_time.test_thread_time() (pythonGH-8267)
  bpo-33967: Remove use of deprecated assertRaisesRegexp() (pythonGH-8261)
  bpo-34080: Fix a memory leak in the compiler. (pythonGH-8222)
  Enable GUI testing on Travis Linux builds via Xvfb (pythonGH-7887)
  bpo-23927: Make getargs.c skipitem() skipping 'w*'. (pythonGH-8192)
  bpo-33648: Remove PY_WARN_ON_C_LOCALE (pythonGH-7114)
  bpo-34092, test_logging: increase SMTPHandlerTest timeout (pythonGH-8245)
  Simplify __all__ in multiprocessing (pythonGH-6856)
  bpo-34083: Update dict order in Functional HOWTO (pythonGH-8230)
  Doc: Point to Simple statements section instead of PEP (pythonGH-8238)
  bpo-29442: Replace optparse with argparse in setup.py (pythonGH-139)
  bpo-33597: Add What's New for PyGC_Head (pythonGH-8236)
  Dataclasses: Fix example on 30.6.8, add method should receive a list rather than an integer. (pythonGH-8038)
  Fix documentation for input and output tutorial (pythonGH-8231)
  bpo-34009: Expand on platform support changes (pythonGH-8022)
  Factor-out two substantially identical code blocks. (pythonGH-8219)
  bpo-34031: fix incorrect usage of self.fail in two tests (pythonGH-8091)
  ...
@grelston grelston mentioned this pull request Jun 11, 2019
Open
@PalmsDragon
Copy link

help !
Python 3.7 in Windows

I cannot get: hdfile = pd.HDFStore('hfile25.h5')
to work. Im' receiving the following error:

File "CSV_to_H5.py", line 17, in
hdfile = pd.HDFStore('hfile25.h5')
File "C:\Users\cdgon\AppData\Local\Programs\Python\Python38-32\lib\site-packages\pandas\io\pytables.py", line 484, in init
tables = import_optional_dependency("tables")
File "C:\Users\cdgon\AppData\Local\Programs\Python\Python38-32\lib\site-packages\pandas\compat_optional.py", line 93, in import_optional_dependency
raise ImportError(message.format(name=name, extra=extra)) from None
ImportError: Missing optional dependency 'tables'. Use pip or conda to install tables.

Help !

tables error
tables error2

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
@jaraco @miss-islington @bedevere-bot @PalmsDragon @the-knights-who-say-ni