Commits · faf0edfe4e164507545d9e74ccf2878e3eaab493 · Kirill Smelkov / cpython

04 Jun, 2011 2 commits
- Replay svn r88852. · faf0edfe
  Barry Warsaw authored Jun 03, 2011
  
  faf0edfe
- Replay svn r88850. · ac77b5be
  Barry Warsaw authored Jun 03, 2011
  
  ac77b5be
28 May, 2011 7 commits
- Nearly null-merge 2.5.6 · 9e2de5fc
  Martin v. Löwis authored May 28, 2011
  
  9e2de5fc
- merge 2.5.6c1 tag · 6982f3e9
  Martin v. Löwis authored May 28, 2011
  
  6982f3e9
- Added tag v2.5.6c1 for changeset a87c7b96672b · 7b30c2fa
  Martin v. Löwis authored May 28, 2011
  
  7b30c2fa
- Added tag v2.5.6 for changeset de34c7b097e8 · 548a96c9
  Martin v. Löwis authored May 28, 2011
  
  548a96c9
- r88840: Prepare for 2.5.6. · c4596414
  Martin v. Löwis authored May 28, 2011
  
  c4596414
- r88828: Fix year. · cf7a89f8
  Martin v. Löwis authored May 28, 2011
  
  cf7a89f8
- r88824: Prepare for 2.5.6c1. · 9115e450
  Martin v. Löwis authored May 28, 2011
  
  9115e450
23 May, 2011 4 commits
- Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit · 51228dcd
  Barry Warsaw authored May 23, 2011
```
message:

Merging post 2.6.7rc2 changes from Subversion.
```
  51228dcd
- Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit · bdd75a62
  Barry Warsaw authored May 23, 2011
```
message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.
```
  bdd75a62
- Replay changeset 70238:03e488b5c009 from fubar branch. Original commit · 5725b114
  Barry Warsaw authored May 23, 2011
```
message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.
```
  5725b114
- These files have Windows line endings in 2.6. · d1f1b166
  Barry Warsaw authored May 22, 2011
  
  d1f1b166
28 Apr, 2011 1 commit
- Closes #11786: ConfigParser.[Raw]ConfigParser optionxform(). · b9be72cd
  Łukasz Langa authored Apr 28, 2011
  
  b9be72cd
17 Apr, 2011 2 commits
- merge 11442 NEWS · dec84970
  Martin v. Löwis authored Apr 17, 2011
  
  dec84970
- Issue 11442: Add NEWS entry for e9724d7abbc2 · faa177f8
  Martin v. Löwis authored Apr 17, 2011
  
  faa177f8
29 Mar, 2011 5 commits
- Merge cleanup. · aa403b4d
  Guido van Rossum authored Mar 29, 2011
  
  aa403b4d
- Merge issue 11662 from 2.5. · 22883802
  Guido van Rossum authored Mar 29, 2011
  
  22883802
- Merge urllib/urllib2 security fix from 2.5 branch. · be51e00e
  guido authored Mar 29, 2011
  
  be51e00e
- Adding .hgignore (copied from default branch). · 57ad4da1
  guido authored Mar 29, 2011
  
  57ad4da1
- Issue #11639: Configuration function documentation referred to logging.XXX... · 37235759
  Vinay Sajip authored Mar 29, 2011
```
Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX.
```
  37235759
28 Mar, 2011 2 commits
- Add CVE number to urllib/urllib2 news item. · aa13c249
  guido authored Mar 28, 2011
  
  aa13c249
- Add tests for the urllib[2] vulnerability. Change to raise exceptions. · 171f03d0
  guido authored Mar 28, 2011
  
  171f03d0
24 Mar, 2011 2 commits
- Add FTP to the allowed url schemes. Add Misc/NEWS. · 83e4a1df
  guido authored Mar 24, 2011
  
  83e4a1df
- Issue 22663: fix redirect vulnerability in urllib/urllib2. · 96ec281e
  guido authored Mar 24, 2011
  
  96ec281e
21 Mar, 2011 2 commits
- null merge · 078f122e
  Martin v. Löwis authored Mar 21, 2011
  
  078f122e
- Set subversion version identification to empty strings if this is not a subversion · 43100329
  Martin v. Löwis authored Mar 21, 2011
```
checkout (but a mercurial one). Closes #11579. Closes #11421.
Patch by Senthil Kumaran.
```
  43100329
19 Mar, 2011 4 commits
- Whoops. The copyright should be two lines (merge from 2.5). · 235e9136
  Guido van Rossum authored Mar 19, 2011
  
  235e9136
- Whoops. The copyright should be two lines. · aafa8204
  Guido van Rossum authored Mar 19, 2011
  
  aafa8204
- Test commit. Add 2011 to copyright line (merge from 2.5). · d261a49d
  Guido van Rossum authored Mar 19, 2011
  
  d261a49d
- Test commit. Add 2011 to copyright line. · 2c2c3100
  Guido van Rossum authored Mar 19, 2011
  
  2c2c3100
17 Mar, 2011 2 commits
- merge from 2.5 branch. · 7d339ffe
  Senthil Kumaran authored Mar 17, 2011
  
  7d339ffe
- Fix issue11442 - Add a charset parameter to the Content-type to avoid XSS attacks. · 5bd75ae0
  Senthil Kumaran authored Mar 17, 2011
```
Patch by Tom N. (Backported from py3k codeline).
```
  5bd75ae0
11 Mar, 2011 1 commit
- Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which... · 1dcdabaf
  Vinay Sajip authored Mar 11, 2011
```
Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.
```
  1dcdabaf
08 Mar, 2011 1 commit
- Issue #11444: Lock handlers while flushing/closing during shutdown. · c2b24440
  Vinay Sajip authored Mar 08, 2011
  
  c2b24440
07 Mar, 2011 1 commit
- Issue #11424: Fix bug in determining child loggers. · e58cb66c
  Vinay Sajip authored Mar 07, 2011
  
  e58cb66c
05 Mar, 2011 4 commits
- Merge tags from 2.5. · 6e0c15b1
  Georg Brandl authored Mar 05, 2011
  
  6e0c15b1
- Add tags from the closed branches. · dcc91c81
  Georg Brandl authored Mar 05, 2011
  
  dcc91c81
- Dummy-merge 2.5 branch into 2.6 branch. · 8eb62f10
  Georg Brandl authored Mar 05, 2011
  
  8eb62f10
- Add .hgeol file and fix newlines in the 2.6 branch. · 8b5fca37
  Georg Brandl authored Mar 05, 2011
  
  8b5fca37