Commits · 8d3069a2219e63989c6f54f39c0f1ff564bd527c · Kirill Smelkov / cpython

19 Oct, 2012 22 commits
- Merge wrong escape removal with 3.3. · 8d3069a2
  Ezio Melotti authored Oct 19, 2012
  
  8d3069a2
- Remove wrong escape in code snippet. · 5b69fbd4
  Ezio Melotti authored Oct 19, 2012
  
  5b69fbd4
- Propagate dummy merge from 3.3 · 359fc8e8
  Nick Coghlan authored Oct 20, 2012
  
  359fc8e8
- Dummy merge from 3.2 · 55062e38
  Nick Coghlan authored Oct 20, 2012
  
  55062e38
- Fix broken test and replace redundant generator with a tuple · 62b41362
  Nick Coghlan authored Oct 20, 2012
  
  62b41362
- Propagate dummy merge from 3.3 · f3cf34cf
  Nick Coghlan authored Oct 19, 2012
  
  f3cf34cf
- Dummy merge from 3.2 · 059e37f5
  Nick Coghlan authored Oct 19, 2012
  
  059e37f5
- Issue #6074: Actually delete the source file in the test as intended · c71b4c71
  Nick Coghlan authored Oct 19, 2012
  
  c71b4c71
- Merge from 3.3 · 324c9fae
  Nick Coghlan authored Oct 19, 2012
  
  324c9fae
- Remove unused import · 11d752e3
  Nick Coghlan authored Oct 19, 2012
  
  11d752e3
- Merge fix from #6074 from 3.3 · d4f5ad6c
  Nick Coghlan authored Oct 19, 2012
  
  d4f5ad6c
- Issue #6074: Apply an appropriate fix for importlib based imports · eb8d627b
  Nick Coghlan authored Oct 19, 2012
  
  eb8d627b
- Propagate dummy merge from 3.3 · 0772398a
  Nick Coghlan authored Oct 19, 2012
  
  0772398a
- Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib · 90eb8ae6
  Nick Coghlan authored Oct 19, 2012
  
  90eb8ae6
- Issue #6074: Forward port Windows read-only source file fix from 2.7 · 34937ce2
  Nick Coghlan authored Oct 19, 2012
  
  34937ce2
- Fix issue #16270: urllib may hang when used for retrieving files via FTP by... · 2d51f687
  Giampaolo Rodola' authored Oct 19, 2012
```
Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager.
```
  2d51f687
- Fix issue #16270: urllib may hang when used for retrieving files via FTP by... · b0cc9129
  Giampaolo Rodola' authored Oct 19, 2012
```
Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager.
```
  b0cc9129
- Fix issue #16270: urllib may hang when used for retrieving files via FTP by... · 89e92854
  Giampaolo Rodola' authored Oct 19, 2012
```
Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager.
```
  89e92854
- Merge with 3.3 · edbe30c7
  Georg Brandl authored Oct 19, 2012
  
  edbe30c7
- Fix merging mistake. · 2ee776bc
  Georg Brandl authored Oct 19, 2012
  
  2ee776bc
- Issue #16226: Fix IDLE Path Browser crash. · 5d590d87
  Ned Deily authored Oct 18, 2012
```
(Patch by Roger Serwy)
```
  5d590d87
- Issue #16226: Fix IDLE Path Browser crash. · bfbf3f13
  Ned Deily authored Oct 18, 2012
```
(Patch by Roger Serwy)
```
  bfbf3f13
18 Oct, 2012 8 commits
- Issue 16280: Drop questionable special-casing of null pointer in PyLong_FromVoidPtr. · e453e4c0
  Mark Dickinson authored Oct 18, 2012
  
  e453e4c0
- Followup to issue #15958: add join.h to Makefile dependencies for byte strings · 74375fc0
  Antoine Pitrou authored Oct 18, 2012
```
(thanks Serhiy).
```
  74375fc0
- Issue #16277: merge fix from 3.3 · 5cb65917
  Mark Dickinson authored Oct 18, 2012
  
  5cb65917
- Issue #16277: merge fix from 3.2 · 44362a88
  Mark Dickinson authored Oct 18, 2012
  
  44362a88
- Issue #16277: in PyLong_FromVoidPtr, add missing branch for sizeof(void*) <= sizeof(long). · 91044799
  Mark Dickinson authored Oct 18, 2012
  
  91044799
- Merge from 3.3: clarify universal-newline wording in tutorial (issue #16266). · 56d279fe
  Chris Jerdonek authored Oct 17, 2012
```
This also null merges from a previous commit.
```
  56d279fe
- Merge from 3.2: clarify universal-newline wording in tutorial (issue #16266). · 206f962f
  Chris Jerdonek authored Oct 17, 2012
  
  206f962f
- Clarify universal-newline wording in tutorial (issue #16266). · 5bf7f1f6
  Chris Jerdonek authored Oct 17, 2012
  
  5bf7f1f6
17 Oct, 2012 10 commits
- Merge heads. · f17512f6
  Trent Nelson authored Oct 17, 2012
  
  f17512f6
- Merge heads. · dd355000
  Trent Nelson authored Oct 17, 2012
  
  dd355000
- Merge issue #15298. · c7864987
  Trent Nelson authored Oct 17, 2012
  
  c7864987
- Issue #15298: refactor previous fix from 66959d419369. · ecbe2a91
  Trent Nelson authored Oct 17, 2012
  
  ecbe2a91
- Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified · 743e0cd6
  Christian Heimes authored Oct 17, 2012
```
endianess detection and handling.
```
  743e0cd6
- merge heads · 1e9af84e
  Andrew Svetlov authored Oct 17, 2012
  
  1e9af84e
- merge heads · e60983e4
  Andrew Svetlov authored Oct 17, 2012
  
  e60983e4
- null merge · 6b2a28a6
  Andrew Svetlov authored Oct 17, 2012
  
  6b2a28a6
- null merge · 72db18c4
  Andrew Svetlov authored Oct 17, 2012
  
  72db18c4
- null merge · 0dccbe13
  Andrew Svetlov authored Oct 17, 2012
  
  0dccbe13