--- python2.7-2.7.12.orig/debian/2to3-2.7.1 +++ python2.7-2.7.12/debian/2to3-2.7.1 @@ -0,0 +1,41 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. +.TH 2TO3-2.7 "1" "January 2012" "2to3-2.7 2.7" "User Commands" +.SH NAME +2to3-2.7 \- Python2 to Python3 converter +.SH SYNOPSIS +.B 2to3 +[\fIoptions\fR] \fIfile|dir \fR... +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-d\fR, \fB\-\-doctests_only\fR +Fix up doctests only +.TP +\fB\-f\fR FIX, \fB\-\-fix\fR=\fIFIX\fR +Each FIX specifies a transformation; default: all +.TP +\fB\-j\fR PROCESSES, \fB\-\-processes\fR=\fIPROCESSES\fR +Run 2to3 concurrently +.TP +\fB\-x\fR NOFIX, \fB\-\-nofix\fR=\fINOFIX\fR +Prevent a transformation from being run +.TP +\fB\-l\fR, \fB\-\-list\-fixes\fR +List available transformations +.TP +\fB\-p\fR, \fB\-\-print\-function\fR +Modify the grammar so that print() is a function +.TP +\fB\-v\fR, \fB\-\-verbose\fR +More verbose logging +.TP +\fB\-\-no\-diffs\fR +Don't show diffs of the refactoring +.TP +\fB\-w\fR, \fB\-\-write\fR +Write back modified files +.TP +\fB\-n\fR, \fB\-\-nobackups\fR +Don't write backups for modified files --- python2.7-2.7.12.orig/debian/FAQ.html +++ python2.7-2.7.12/debian/FAQ.html @@ -0,0 +1,8997 @@ + + +The Whole Python FAQ + + + +

The Whole Python FAQ

+Last changed on Wed Feb 12 21:31:08 2003 CET + +

(Entries marked with ** were changed within the last 24 hours; +entries marked with * were changed within the last 7 days.) +

+ +

+

+

1. General information and availability

+

1.1. What is Python? +
1.2. Why is it called Python? +
1.3. How do I obtain a copy of the Python source? +
1.4. How do I get documentation on Python? +
1.5. Are there other ftp sites that mirror the Python distribution? +
1.6. Is there a newsgroup or mailing list devoted to Python? +
1.7. Is there a WWW page devoted to Python? +
1.8. Is the Python documentation available on the WWW? +
1.9. Are there any books on Python? +
1.10. Are there any published articles about Python that I can reference? +
1.11. Are there short introductory papers or talks on Python? +
1.12. How does the Python version numbering scheme work? +
1.13. How do I get a beta test version of Python? +
1.14. Are there copyright restrictions on the use of Python? +
1.15. Why was Python created in the first place? +
1.16. Do I have to like "Monty Python's Flying Circus"? +
1.17. What is Python good for? +
1.18. Can I use the FAQ Wizard software to maintain my own FAQ? +
1.19. Which editor has good support for editing Python source code? +
1.20. I've never programmed before. Is there a Python tutorial? +
1.21. Where in the world is www.python.org located? + +

+ +

+

+

2. Python in the real world

+

2.1. How many people are using Python? +
2.2. Have any significant projects been done in Python? +
2.3. Are there any commercial projects going on using Python? +
2.4. How stable is Python? +
2.5. What new developments are expected for Python in the future? +
2.6. Is it reasonable to propose incompatible changes to Python? +
2.7. What is the future of Python? +
2.8. What was the PSA, anyway? +
2.9. Deleted +
2.10. Deleted +
2.11. Is Python Y2K (Year 2000) Compliant? +
2.12. Is Python a good language in a class for beginning programmers? + +

+ +

+

+

3. Building Python and Other Known Bugs

+

3.1. Is there a test set? +
3.2. When running the test set, I get complaints about floating point operations, but when playing with floating point operations I cannot find anything wrong with them. +
3.3. Link errors after rerunning the configure script. +
3.4. The python interpreter complains about options passed to a script (after the script name). +
3.5. When building on the SGI, make tries to run python to create glmodule.c, but python hasn't been built or installed yet. +
3.6. I use VPATH but some targets are built in the source directory. +
3.7. Trouble building or linking with the GNU readline library. +
3.8. Trouble with socket I/O on older Linux 1.x versions. +
3.9. Trouble with prototypes on Ultrix. +
3.10. Other trouble building Python on platform X. +
3.11. How to configure dynamic loading on Linux. +
3.12. I can't get shared modules to work on Linux 2.0 (Slackware96)? +
3.13. Trouble when making modules shared on Linux. +
3.14. [deleted] +
3.15. Errors when linking with a shared library containing C++ code. +
3.16. Deleted +
3.17. Deleted. +
3.18. Compilation or link errors for the _tkinter module +
3.19. I configured and built Python for Tcl/Tk but "import Tkinter" fails. +
3.20. [deleted] +
3.21. Several common system calls are missing from the posix module. +
3.22. ImportError: No module named string, on MS Windows. +
3.23. Core dump on SGI when using the gl module. +
3.24. "Initializer not a constant" while building DLL on MS-Windows +
3.25. Output directed to a pipe or file disappears on Linux. +
3.26. [deleted] +
3.27. [deleted] +
3.28. How can I test if Tkinter is working? +
3.29. Is there a way to get the interactive mode of the python interpreter to perform function/variable name completion? +
3.30. Why is the Python interpreter not built as a shared library? +
3.31. Build with GCC on Solaris 2.6 (SunOS 5.6) fails +
3.32. Running "make clean" seems to leave problematic files that cause subsequent builds to fail. +
3.33. Submitting bug reports and patches +
3.34. I can't load shared libraries under Python 1.5.2, Solaris 7, and gcc 2.95.2 +
3.35. In the regression test, test___all__ fails for the profile module. What's wrong? +
3.36. relocations remain against allocatable but non-writable sections + +

+ +

+

+

4. Programming in Python

+

4.1. Is there a source code level debugger with breakpoints, step, etc.? +
4.2. Can I create an object class with some methods implemented in C and others in Python (e.g. through inheritance)? (Also phrased as: Can I use a built-in type as base class?) +
4.3. Is there a curses/termcap package for Python? +
4.4. Is there an equivalent to C's onexit() in Python? +
4.5. [deleted] +
4.6. How do I iterate over a sequence in reverse order? +
4.7. My program is too slow. How do I speed it up? +
4.8. When I have imported a module, then edit it, and import it again (into the same Python process), the changes don't seem to take place. What is going on? +
4.9. How do I find the current module name? +
4.10. I have a module in which I want to execute some extra code when it is run as a script. How do I find out whether I am running as a script? +
4.11. I try to run a program from the Demo directory but it fails with ImportError: No module named ...; what gives? +
4.12. [deleted] +
4.13. What GUI toolkits exist for Python? +
4.14. Are there any interfaces to database packages in Python? +
4.15. Is it possible to write obfuscated one-liners in Python? +
4.16. Is there an equivalent of C's "?:" ternary operator? +
4.17. My class defines __del__ but it is not called when I delete the object. +
4.18. How do I change the shell environment for programs called using os.popen() or os.system()? Changing os.environ doesn't work. +
4.19. What is a class? +
4.20. What is a method? +
4.21. What is self? +
4.22. What is an unbound method? +
4.23. How do I call a method defined in a base class from a derived class that overrides it? +
4.24. How do I call a method from a base class without using the name of the base class? +
4.25. How can I organize my code to make it easier to change the base class? +
4.26. How can I find the methods or attributes of an object? +
4.27. I can't seem to use os.read() on a pipe created with os.popen(). +
4.28. How can I create a stand-alone binary from a Python script? +
4.29. What WWW tools are there for Python? +
4.30. How do I run a subprocess with pipes connected to both input and output? +
4.31. How do I call a function if I have the arguments in a tuple? +
4.32. How do I enable font-lock-mode for Python in Emacs? +
4.33. Is there a scanf() or sscanf() equivalent? +
4.34. Can I have Tk events handled while waiting for I/O? +
4.35. How do I write a function with output parameters (call by reference)? +
4.36. Please explain the rules for local and global variables in Python. +
4.37. How can I have modules that mutually import each other? +
4.38. How do I copy an object in Python? +
4.39. How to implement persistent objects in Python? (Persistent == automatically saved to and restored from disk.) +
4.40. I try to use __spam and I get an error about _SomeClassName__spam. +
4.41. How do I delete a file? And other file questions. +
4.42. How to modify urllib or httplib to support HTTP/1.1? +
4.43. Unexplicable syntax errors in compile() or exec. +
4.44. How do I convert a string to a number? +
4.45. How do I convert a number to a string? +
4.46. How do I copy a file? +
4.47. How do I check if an object is an instance of a given class or of a subclass of it? +
4.48. What is delegation? +
4.49. How do I test a Python program or component. +
4.50. My multidimensional list (array) is broken! What gives? +
4.51. I want to do a complicated sort: can you do a Schwartzian Transform in Python? +
4.52. How to convert between tuples and lists? +
4.53. Files retrieved with urllib contain leading garbage that looks like email headers. +
4.54. How do I get a list of all instances of a given class? +
4.55. A regular expression fails with regex.error: match failure. +
4.56. I can't get signal handlers to work. +
4.57. I can't use a global variable in a function? Help! +
4.58. What's a negative index? Why doesn't list.insert() use them? +
4.59. How can I sort one list by values from another list? +
4.60. Why doesn't dir() work on builtin types like files and lists? +
4.61. How can I mimic CGI form submission (METHOD=POST)? +
4.62. If my program crashes with a bsddb (or anydbm) database open, it gets corrupted. How come? +
4.63. How do I make a Python script executable on Unix? +
4.64. How do you remove duplicates from a list? +
4.65. Are there any known year 2000 problems in Python? +
4.66. I want a version of map that applies a method to a sequence of objects! Help! +
4.67. How do I generate random numbers in Python? +
4.68. How do I access the serial (RS232) port? +
4.69. Images on Tk-Buttons don't work in Py15? +
4.70. Where is the math.py (socket.py, regex.py, etc.) source file? +
4.71. How do I send mail from a Python script? +
4.72. How do I avoid blocking in connect() of a socket? +
4.73. How do I specify hexadecimal and octal integers? +
4.74. How to get a single keypress at a time? +
4.75. How can I overload constructors (or methods) in Python? +
4.76. How do I pass keyword arguments from one method to another? +
4.77. What module should I use to help with generating HTML? +
4.78. How do I create documentation from doc strings? +
4.79. How do I read (or write) binary data? +
4.80. I can't get key bindings to work in Tkinter +
4.81. "import crypt" fails +
4.82. Are there coding standards or a style guide for Python programs? +
4.83. How do I freeze Tkinter applications? +
4.84. How do I create static class data and static class methods? +
4.85. __import__('x.y.z') returns <module 'x'>; how do I get z? +
4.86. Basic thread wisdom +
4.87. Why doesn't closing sys.stdout (stdin, stderr) really close it? +
4.88. What kinds of global value mutation are thread-safe? +
4.89. How do I modify a string in place? +
4.90. How to pass on keyword/optional parameters/arguments +
4.91. How can I get a dictionary to display its keys in a consistent order? +
4.92. Is there a Python tutorial? +
4.93. Deleted +
4.94. How do I get a single keypress without blocking? +
4.95. Is there an equivalent to Perl chomp()? (Remove trailing newline from string) +
4.96. Why is join() a string method when I'm really joining the elements of a (list, tuple, sequence)? +
4.97. How can my code discover the name of an object? +
4.98. Why are floating point calculations so inaccurate? +
4.99. I tried to open Berkeley DB file, but bsddb produces bsddb.error: (22, 'Invalid argument'). Help! How can I restore my data? +
4.100. What are the "best practices" for using import in a module? +
4.101. Is there a tool to help find bugs or perform static analysis? +
4.102. UnicodeError: ASCII [decoding,encoding] error: ordinal not in range(128) +
4.103. Using strings to call functions/methods +
4.104. How fast are exceptions? +
4.105. Sharing global variables across modules +
4.106. Why is cPickle so slow? +
4.107. When importing module XXX, why do I get "undefined symbol: PyUnicodeUCS2_..." ? +
4.108. How do I create a .pyc file? + +

+ +

+

+

5. Extending Python

+

5.1. Can I create my own functions in C? +
5.2. Can I create my own functions in C++? +
5.3. How can I execute arbitrary Python statements from C? +
5.4. How can I evaluate an arbitrary Python expression from C? +
5.5. How do I extract C values from a Python object? +
5.6. How do I use Py_BuildValue() to create a tuple of arbitrary length? +
5.7. How do I call an object's method from C? +
5.8. How do I catch the output from PyErr_Print() (or anything that prints to stdout/stderr)? +
5.9. How do I access a module written in Python from C? +
5.10. How do I interface to C++ objects from Python? +
5.11. mSQLmodule (or other old module) won't build with Python 1.5 (or later) +
5.12. I added a module using the Setup file and the make fails! Huh? +
5.13. I want to compile a Python module on my Red Hat Linux system, but some files are missing. +
5.14. What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean? +
5.15. How to tell "incomplete input" from "invalid input"? +
5.16. How do I debug an extension? +
5.17. How do I find undefined Linux g++ symbols, __builtin_new or __pure_virtural +
5.18. How do I define and create objects corresponding to built-in/extension types + +

+ +

+

+

6. Python's design

+

6.1. Why isn't there a switch or case statement in Python? +
6.2. Why does Python use indentation for grouping of statements? +
6.3. Why are Python strings immutable? +
6.4. Delete +
6.5. Why does Python use methods for some functionality (e.g. list.index()) but functions for other (e.g. len(list))? +
6.6. Why can't I derive a class from built-in types (e.g. lists or files)? +
6.7. Why must 'self' be declared and used explicitly in method definitions and calls? +
6.8. Can't you emulate threads in the interpreter instead of relying on an OS-specific thread implementation? +
6.9. Why can't lambda forms contain statements? +
6.10. [deleted] +
6.11. [deleted] +
6.12. Why is there no more efficient way of iterating over a dictionary than first constructing the list of keys()? +
6.13. Can Python be compiled to machine code, C or some other language? +
6.14. How does Python manage memory? +
6.15. Why are there separate tuple and list data types? +
6.16. How are lists implemented? +
6.17. How are dictionaries implemented? +
6.18. Why must dictionary keys be immutable? +
6.19. How the heck do you make an array in Python? +
6.20. Why doesn't list.sort() return the sorted list? +
6.21. How do you specify and enforce an interface spec in Python? +
6.22. Why do all classes have the same type? Why do instances all have the same type? +
6.23. Why isn't all memory freed when Python exits? +
6.24. Why no class methods or mutable class variables? +
6.25. Why are default values sometimes shared between objects? +
6.26. Why no goto? +
6.27. How do you make a higher order function in Python? +
6.28. Why do I get a SyntaxError for a 'continue' inside a 'try'? +
6.29. Why can't raw strings (r-strings) end with a backslash? +
6.30. Why can't I use an assignment in an expression? +
6.31. Why doesn't Python have a "with" statement like some other languages? +
6.32. Why are colons required for if/while/def/class? +
6.33. Can't we get rid of the Global Interpreter Lock? + +

+ +

+

+

7. Using Python on non-UNIX platforms

+

7.1. Is there a Mac version of Python? +
7.2. Are there DOS and Windows versions of Python? +
7.3. Is there an OS/2 version of Python? +
7.4. Is there a VMS version of Python? +
7.5. What about IBM mainframes, or other non-UNIX platforms? +
7.6. Where are the source or Makefiles for the non-UNIX versions? +
7.7. What is the status and support for the non-UNIX versions? +
7.8. I have a PC version but it appears to be only a binary. Where's the library? +
7.9. Where's the documentation for the Mac or PC version? +
7.10. How do I create a Python program file on the Mac or PC? +
7.11. How can I use Tkinter on Windows 95/NT? +
7.12. cgi.py (or other CGI programming) doesn't work sometimes on NT or win95! +
7.13. Why doesn't os.popen() work in PythonWin on NT? +
7.14. How do I use different functionality on different platforms with the same program? +
7.15. Is there an Amiga version of Python? +
7.16. Why doesn't os.popen()/win32pipe.popen() work on Win9x? + +

+ +

+

+

8. Python on Windows

+

8.1. Using Python for CGI on Microsoft Windows +
8.2. How to check for a keypress without blocking? +
8.3. $PYTHONPATH +
8.4. dedent syntax errors +
8.5. How do I emulate os.kill() in Windows? +
8.6. Why does os.path.isdir() fail on NT shared directories? +
8.7. PyRun_SimpleFile() crashes on Windows but not on Unix +
8.8. Import of _tkinter fails on Windows 95/98 +
8.9. Can't extract the downloaded documentation on Windows +
8.10. Can't get Py_RunSimpleFile() to work. +
8.11. Where is Freeze for Windows? +
8.12. Is a *.pyd file the same as a DLL? +
8.13. Missing cw3215mt.dll (or missing cw3215.dll) +
8.14. How to make python scripts executable: +
8.15. Warning about CTL3D32 version from installer +
8.16. How can I embed Python into a Windows application? +
8.17. Setting up IIS 5 to use Python for CGI +
8.18. How do I run a Python program under Windows? + +

+ +

+

1. General information and availability

+ +

+

1.1. What is Python?

+Python is an interpreted, interactive, object-oriented programming +language. It incorporates modules, exceptions, dynamic typing, very +high level dynamic data types, and classes. Python combines +remarkable power with very clear syntax. It has interfaces to many +system calls and libraries, as well as to various window systems, and +is extensible in C or C++. It is also usable as an extension language +for applications that need a programmable interface. Finally, Python +is portable: it runs on many brands of UNIX, on the Mac, and on PCs +under MS-DOS, Windows, Windows NT, and OS/2. +

+To find out more, the best thing to do is to start reading the +tutorial from the documentation set (see a few questions further +down). +

+See also question 1.17 (what is Python good for). +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 26 16:05:18 1997 by +GvR +

+ +

+

1.2. Why is it called Python?

+Apart from being a computer scientist, I'm also a fan of "Monty +Python's Flying Circus" (a BBC comedy series from the seventies, in +the -- unlikely -- case you didn't know). It occurred to me one day +that I needed a name that was short, unique, and slightly mysterious. +And I happened to be reading some scripts from the series at the +time... So then I decided to call my language Python. +

+By now I don't care any more whether you use a Python, some other +snake, a foot or 16-ton weight, or a wood rat as a logo for Python! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 24 00:50:41 2000 by +GvR +

+ +

+

1.3. How do I obtain a copy of the Python source?

+The latest Python source distribution is always available from +python.org, at http://www.python.org/download. The latest development sources can be obtained via anonymous CVS from SourceForge, at http://www.sf.net/projects/python . +

+The source distribution is a gzipped tar file containing the complete C source, LaTeX +documentation, Python library modules, example programs, and several +useful pieces of freely distributable software. This will compile and +run out of the box on most UNIX platforms. (See section 7 for +non-UNIX information.) +

+Older versions of Python are also available from python.org. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:06:16 2002 by +A.M. Kuchling +

+ +

+

1.4. How do I get documentation on Python?

+All documentation is available on-line, starting at http://www.python.org/doc/. +

+The LaTeX source for the documentation is part of the source +distribution. If you don't have LaTeX, the latest Python +documentation set is available, in various formats like postscript +and html, by anonymous ftp - visit the above URL for links to the +current versions. +

+PostScript for a high-level description of Python is in the file nluug-paper.ps +(a separate file on the ftp site). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 21 12:02:55 1998 by +Ken Manheimer +

+ +

+

1.5. Are there other ftp sites that mirror the Python distribution?

+The following anonymous ftp sites keep mirrors of the Python +distribution: +

+USA: +

+

+        ftp://ftp.python.org/pub/python/
+        ftp://gatekeeper.dec.com/pub/plan/python/
+        ftp://ftp.uu.net/languages/python/
+        ftp://ftp.wustl.edu/graphics/graphics/sgi-stuff/python/
+        ftp://ftp.sterling.com/programming/languages/python/
+        ftp://uiarchive.cso.uiuc.edu/pub/lang/python/
+        ftp://ftp.pht.com/mirrors/python/python/
+	ftp://ftp.cdrom.com/pub/python/
+

+Europe: +

+

+        ftp://ftp.cwi.nl/pub/python/
+        ftp://ftp.funet.fi/pub/languages/python/
+        ftp://ftp.sunet.se/pub/lang/python/
+        ftp://unix.hensa.ac.uk/mirrors/uunet/languages/python/
+        ftp://ftp.lip6.fr/pub/python/
+        ftp://sunsite.cnlab-switch.ch/mirror/python/
+        ftp://ftp.informatik.tu-muenchen.de/pub/comp/programming/languages/python/
+

+Australia: +

+

+        ftp://ftp.dstc.edu.au/pub/python/
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 24 09:20:49 1999 by +A.M. Kuchling +

+ +

+

1.6. Is there a newsgroup or mailing list devoted to Python?

+There is a newsgroup, comp.lang.python, +and a mailing list. The newsgroup and mailing list are gatewayed into +each other -- if you can read news it's unnecessary to subscribe to +the mailing list. To subscribe to the mailing list +(python-list@python.org) visit its Mailman webpage at +http://www.python.org/mailman/listinfo/python-list +

+More info about the newsgroup and mailing list, and about other lists, +can be found at +http://www.python.org/psa/MailingLists.html. +

+Archives of the newsgroup are kept by Deja News and accessible +through the "Python newsgroup search" web page, +http://www.python.org/search/search_news.html. +This page also contains pointer to other archival collections. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 23 09:29:36 1999 by +GvR +

+ +

+

1.7. Is there a WWW page devoted to Python?

+Yes, http://www.python.org/ is the official Python home page. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 14:42:59 1997 by +Ken Manheimer +

+ +

+

1.8. Is the Python documentation available on the WWW?

+Yes. Python 2.0 documentation is available from +http://www.pythonlabs.com/tech/python2.0/doc/ and from +http://www.python.org/doc/. Note that most documentation +is available for on-line browsing as well as for downloading. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:14:08 2001 by +Moshe Zadka +

+ +

+

1.9. Are there any books on Python?

+Yes, many, and more are being published. See +the python.org Wiki at http://www.python.org/cgi-bin/moinmoin/PythonBooks for a list. +

+You can also search online bookstores for "Python" +(and filter out the Monty Python references; or +perhaps search for "Python" and "language"). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Aug 5 19:08:49 2002 by +amk +

+ +

+

1.10. Are there any published articles about Python that I can reference?

+If you can't reference the web site, and you don't want to reference the books +(see previous question), there are several articles on Python that you could +reference. +

+Most publications about Python are collected on the Python web site: +

+

+    http://www.python.org/doc/Publications.html
+

+It is no longer recommended to reference this +very old article by Python's author: +

+

+    Guido van Rossum and Jelke de Boer, "Interactively Testing Remote
+    Servers Using the Python Programming Language", CWI Quarterly, Volume
+    4, Issue 4 (December 1991), Amsterdam, pp 283-303.
+

+

+ +Edit this entry / +Log info + +/ Last changed on Sat Jul 4 20:52:31 1998 by +GvR +

+ +

+

1.11. Are there short introductory papers or talks on Python?

+There are several - you can find links to some of them collected at +http://www.python.org/doc/Hints.html#intros. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:04:05 1997 by +Ken Manheimer +

+ +

+

1.12. How does the Python version numbering scheme work?

+Python versions are numbered A.B.C or A.B. A is the major version +number -- it is only incremented for really major changes in the +language. B is the minor version number, incremented for less +earth-shattering changes. C is the micro-level -- it is +incremented for each bugfix release. See PEP 6 for more information +about bugfix releases. +

+Not all releases have bugfix releases. +Note that in the past (ending with 1.5.2), +micro releases have added significant changes; +in fact the changeover from 0.9.9 to 1.0.0 was the first time +that either A or B changed! +

+Alpha, beta and release candidate versions have an additional suffixes. +The suffix for an alpha version is "aN" for some small number N, the +suffix for a beta version is "bN" for some small number N, and the +suffix for a release candidate version is "cN" for some small number N. +

+Note that (for instance) all versions labeled 2.0aN precede the +versions labeled 2.0bN, which precede versions labeled 2.0cN, and +those precede 2.0. +

+As a rule, no changes are made between release candidates and the final +release unless there are show-stopper bugs. +

+You may also find version numbers with a "+" suffix, e.g. "2.2+". +These are unreleased versions, built directly from the CVS trunk. +

+See also the documentation for sys.version, sys.hexversion, and +sys.version_info. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 14 06:34:17 2002 by +GvR +

+ +

+

1.13. How do I get a beta test version of Python?

+All releases, including alphas, betas and release candidates, are announced on +comp.lang.python and comp.lang.python.announce newsgroups, +which are gatewayed into the python-list@python.org and +python-announce@python.org. In addition, all these announcements appear on +the Python home page, at http://www.python.org. +

+You can also access the development version of Python through CVS. See http://sourceforge.net/cvs/?group_id=5470 for details. If you're not familiar with CVS, documents like http://linux.oreillynet.com/pub/a/linux/2002/01/03/cvs_intro.html +provide an introduction. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 00:57:08 2002 by +Neal Norwitz +

+ +

+

1.14. Are there copyright restrictions on the use of Python?

+Hardly. You can do anything you want with the source, as long as +you leave the copyrights in, and display those copyrights in any +documentation about Python that you produce. Also, don't use the +author's institute's name in publicity without prior written +permission, and don't hold them responsible for anything (read the +actual copyright for a precise legal wording). +

+In particular, if you honor the copyright rules, it's OK to use Python +for commercial use, to sell copies of Python in source or binary form, +or to sell products that enhance Python or incorporate Python (or part +of it) in some form. I would still like to know about all commercial +use of Python! +

+ +Edit this entry / +Log info +

+ +

+

1.15. Why was Python created in the first place?

+Here's a very brief summary of what got me started: +

+I had extensive experience with implementing an interpreted language +in the ABC group at CWI, and from working with this group I had +learned a lot about language design. This is the origin of many +Python features, including the use of indentation for statement +grouping and the inclusion of very-high-level data types (although the +details are all different in Python). +

+I had a number of gripes about the ABC language, but also liked many +of its features. It was impossible to extend the ABC language (or its +implementation) to remedy my complaints -- in fact its lack of +extensibility was one of its biggest problems. +I had some experience with using Modula-2+ and talked with the +designers of Modula-3 (and read the M3 report). M3 is the origin of +the syntax and semantics used for exceptions, and some other Python +features. +

+I was working in the Amoeba distributed operating system group at +CWI. We needed a better way to do system administration than by +writing either C programs or Bourne shell scripts, since Amoeba had +its own system call interface which wasn't easily accessible from the +Bourne shell. My experience with error handling in Amoeba made me +acutely aware of the importance of exceptions as a programming +language feature. +

+It occurred to me that a scripting language with a syntax like ABC +but with access to the Amoeba system calls would fill the need. I +realized that it would be foolish to write an Amoeba-specific +language, so I decided that I needed a language that was generally +extensible. +

+During the 1989 Christmas holidays, I had a lot of time on my hand, +so I decided to give it a try. During the next year, while still +mostly working on it in my own time, Python was used in the Amoeba +project with increasing success, and the feedback from colleagues made +me add many early improvements. +

+In February 1991, after just over a year of development, I decided +to post to USENET. The rest is in the Misc/HISTORY file. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 00:06:23 1997 by +GvR +

+ +

+

1.16. Do I have to like "Monty Python's Flying Circus"?

+No, but it helps. Pythonistas like the occasional reference to SPAM, +and of course, nobody expects the Spanish Inquisition +

+The two main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+

+The three main reasons to use Python are: +

+

+ - Portable
+ - Easy to learn
+ - Powerful standard library
+

+(And nice red uniforms.) +

+And remember, there is no rule six. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 10:39:21 1997 by +GvR +

+ +

+

1.17. What is Python good for?

+Python is used in many situations where a great deal of dynamism, +ease of use, power, and flexibility are required. +

+In the area of basic text +manipulation core Python (without any non-core extensions) is easier +to use and is roughly as fast as just about any language, and this makes Python +good for many system administration type tasks and for CGI programming +and other application areas that manipulate text and strings and such. +

+When augmented with +standard extensions (such as PIL, COM, Numeric, oracledb, kjbuckets, +tkinter, win32api, etc.) +or special purpose extensions (that you write, perhaps using helper tools such +as SWIG, or using object protocols such as ILU/CORBA or COM) Python +becomes a very convenient "glue" or "steering" +language that helps make heterogeneous collections of unrelated +software packages work together. +For example by combining Numeric with oracledb you can help your +SQL database do statistical analysis, or even Fourier transforms. +One of the features that makes Python excel in the "glue language" role +is Python's simple, usable, and powerful C language runtime API. +

+Many developers also use Python extensively as a graphical user +interface development aide. +

+ +Edit this entry / +Log info + +/ Last changed on Sat May 24 10:13:11 1997 by +Aaron Watters +

+ +

+

1.18. Can I use the FAQ Wizard software to maintain my own FAQ?

+Sure. It's in Tools/faqwiz/ of the python source tree. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 29 06:50:32 2002 by +Aahz +

+ +

+

1.19. Which editor has good support for editing Python source code?

+On Unix, the first choice is Emacs/XEmacs. There's an elaborate +mode for editing Python code, which is available from the Python +source distribution (Misc/python-mode.el). It's also bundled +with XEmacs (we're still working on legal details to make it possible +to bundle it with FSF Emacs). And it has its own web page: +

+

+    http://www.python.org/emacs/python-mode/index.html
+

+There are many other choices, for Unix, Windows or Macintosh. +Richard Jones compiled a table from postings on the Python newsgroup: +

+

+    http://www.bofh.asn.au/~richard/editors.html
+

+See also FAQ question 7.10 for some more Mac and Win options. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 15 23:21:04 1998 by +Gvr +

+ +

+

1.20. I've never programmed before. Is there a Python tutorial?

+There are several, and at least one book. +All information for beginning Python programmers is collected here: +

+

+    http://www.python.org/doc/Newbies.html
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 5 05:34:07 2001 by +GvR +

+ +

+

1.21. Where in the world is www.python.org located?

+It's currently in Amsterdam, graciously hosted by XS4ALL: +

+

+    http://www.xs4all.nl
+

+Thanks to Thomas Wouters for setting this up!!!! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 3 21:49:27 2001 by +GvR +

+ +

+

2. Python in the real world

+ +

+

2.1. How many people are using Python?

+Certainly thousands, and quite probably tens of thousands of users. +More are seeing the light each day. The comp.lang.python newsgroup is +very active, but overall there is no accurate estimate of the number of subscribers or Python users. +

+Jacek Artymiak has created a Python Users Counter; you can see the +current count by visiting +http://www.wszechnica.safenet.pl/cgi-bin/checkpythonuserscounter.py +(this will not increment the counter; use the link there if you haven't +added yourself already). Most Python users appear not to have registered themselves. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Feb 21 23:29:18 2002 by +GvR +

+ +

+

2.2. Have any significant projects been done in Python?

+At CWI (the former home of Python), we have written a 20,000 line +authoring environment for transportable hypermedia presentations, a +5,000 line multimedia teleconferencing tool, as well as many many +smaller programs. +

+At CNRI (Python's new home), we have written two large applications: +Grail, a fully featured web browser (see +http://grail.cnri.reston.va.us), +and the Knowbot Operating Environment, +a distributed environment for mobile code. +

+The University of Virginia uses Python to control a virtual reality +engine. See http://alice.cs.cmu.edu. +

+The ILU project at Xerox PARC can generate Python glue for ILU +interfaces. See ftp://ftp.parc.xerox.com/pub/ilu/ilu.html. ILU +is a free CORBA compliant ORB which supplies distributed object +connectivity to a host of platforms using a host of languages. +

+Mark Hammond and Greg Stein and others are interfacing Python to +Microsoft's COM and ActiveX architectures. This means, among other +things, that Python may be used in active server pages or as a COM +controller (for example to automatically extract from or insert information +into Excel or MSAccess or any other COM aware application). +Mark claims Python can even be a ActiveX scripting host (which +means you could embed JScript inside a Python application, if you +had a strange sense of humor). Python/AX/COM is distributed as part +of the PythonWin distribution. +

+The University of California, Irvine uses a student administration +system called TELE-Vision written entirely in Python. Contact: Ray +Price rlprice@uci.edu. +

+The Melbourne Cricket Ground (MCG) in Australia (a 100,000+ person venue) +has it's scoreboard system written largely in Python on MS Windows. +Python expressions are used to create almost every scoring entry that +appears on the board. The move to Python/C++ away from exclusive C++ +has provided a level of functionality that would simply not have been +viable otherwise. +

+See also the next question. +

+Note: this FAQ entry is really old. +See http://www.python.org/psa/Users.html for a more recent list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 25 13:24:15 2000 by +GvR +

+ +

+

2.3. Are there any commercial projects going on using Python?

+Yes, there's lots of commercial activity using Python. See +http://www.python.org/psa/Users.html for a list. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 14 18:17:33 1998 by +ken +

+ +

+

2.4. How stable is Python?

+Very stable. New, stable releases have been coming out roughly every 3 to 12 months since 1991, and this seems likely to continue. +

+With the introduction of retrospective "bugfix" releases the stability of the language implementations can be, and is being, improved independently of the new features offered by more recent major or minor releases. Bugfix releases, indicated by a third component of the version number, only fix known problems and do not gratuitously introduce new and possibly incompatible features or modified library functionality. +

+Release 2.2 got its first bugfix on April 10, 2002. The new version +number is now 2.2.1. The 2.1 release, at 2.1.3, can probably be +considered the "most stable" platform because it has been bugfixed +twice. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 23 10:20:04 2002 by +Jens Kubieziel +

+ +

+

2.5. What new developments are expected for Python in the future?

+See http://www.python.org/peps/ for the Python Enhancement +Proposals (PEPs). PEPs are design +documents +describing a suggested new feature for Python, providing +a concise technical specification and a rationale. +

+Also, follow the discussions on the python-dev mailing list. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 9 17:09:51 2002 by +A.M. Kuchling +

+ +

+

2.6. Is it reasonable to propose incompatible changes to Python?

+In general, no. There are already millions of lines of Python code +around the world, so any changes in the language that invalidates more +than a very small fraction of existing programs has to be frowned +upon. Even if you can provide a conversion program, there still is +the problem of updating all documentation. Providing a gradual +upgrade path is the only way if a feature has to be changed. +

+See http://www.python.org/peps/pep-0005.html for the proposed +mechanism for creating backwards-incompatibilities. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:13:47 2002 by +Fred Drake +

+ +

+

2.7. What is the future of Python?

+Please see http://www.python.org/peps/ for proposals of future +activities. One of the PEPs (Python Enhancement Proposals) deals +with the PEP process and PEP format -- see +http://www.python.org/peps/pep-0001.html if you want to +submit a PEP. In http://www.python.org/peps/pep-0042.html there +is a list of wishlists the Python Development team plans to tackle. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:15:46 2002 by +Fred Drake +

+ +

+

2.8. What was the PSA, anyway?

+The Python Software Activity was +created by a number of Python aficionados who want Python to be more +than the product and responsibility of a single individual. +The PSA was not an independent organization, but lived +under the umbrealla of CNRI. +

+The PSA has been superseded by the Python Software Foundation, +an independent non-profit organization. The PSF's home page +is at http://www.python.org/psf/. +

+Some pages created by the PSA still live at +http://www.python.org/psa/ +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 25 18:19:44 2002 by +GvR +

+ +

+

2.9. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:51:30 2001 by +Moshe Zadka +

+ +

+

2.10. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:52:19 2001 by +Moshe Zadka +

+ +

+

2.11. Is Python Y2K (Year 2000) Compliant?

+As of January, 2001 no major problems have been reported and Y2K +compliance seems to be a non-issue. +

+Since Python is available free of charge, there are no absolute +guarantees. If there are unforeseen problems, liability is the +user's rather than the developers', and there is nobody you can sue for damages. +

+Python does few +date manipulations, and what it does is all based on the Unix +representation for time (even on non-Unix systems) which uses seconds +since 1970 and won't overflow until 2038. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:19:32 2001 by +Steve Holden +

+ +

+

2.12. Is Python a good language in a class for beginning programmers?

+Yes. This long answer attempts to address any concerns you might +have with teaching Python as a programmer's first language. +(If you want to discuss Python's use in education, then +you may be interested in joining the edu-sig mailinglist. +See http://www.python.org/sigs/edu-sig/ ) +

+It is still common to start students with a procedural +(subset of a) statically typed language such as Pascal, C, or +a subset of C++ or Java. I think that students may be better +served by learning Python as their first language. Python has +a very simple and consistent syntax and a large standard library. +Most importantly, using Python in a beginning programming course +permits students to concentrate on important programming skills, +such as problem decomposition and data type design. +

+With Python, students can be quickly introduced to basic concepts +such as loops and procedures. They can even probably work with +user-defined objects in their very first course. They could +implement a tree structure as nested Python lists, for example. +They could be introduced to objects in their first course if +desired. For a student who has never programmed before, using +a statically typed language seems unnatural. It presents +additional complexity that the student must master and slows +the pace of the course. The students are trying to learn to +think like a computer, decompose problems, design consistent +interfaces, and encapsulate data. While learning to use a +statically typed language is important, it is not necessarily the +best topic to address in the students' first programming course. +

+Many other aspects of Python make it a good first language. +Python has a large standard library (like Java) so that +students can be assigned programming projects very early in the +course that do something. Assignments aren't restricted to the +standard four-function calculator and check balancing programs. +By using the standard library, students can gain the satisfaction +of working on realistic applications as they learn the fundamentals +of programming. Using the standard library also teaches students +about code reuse. +

+Python's interactive interpreter also enables students to +test language features while they're programming. They can keep +a window with the interpreter running while they enter their +programs' source in another window. If they can't remember the +methods for a list, they can do something like this: +

+

+ >>> L = []
+ >>> dir(L)
+ ['append', 'count', 'extend', 'index', 'insert', 'pop', 'remove',
+ 'reverse', 'sort']
+ >>> print L.append.__doc__
+ L.append(object) -- append object to end
+ >>> L.append(1)
+ >>> L
+ [1]
+

+With the interpreter, documentation is never far from the +student as he's programming. +

+There are also good IDEs for Python. Guido van Rossum's IDLE +is a cross-platform IDE for Python that is written in Python +using Tk. There is also a Windows specific IDE called PythonWin. +Emacs users will be happy to know that there is a very good Python +mode for Emacs. All of these programming environments provide +syntax highlighting, auto-indenting, and access to the interactive +interpreter while coding. For more information about IDEs, see XXX. +

+If your department is currently using Pascal because it was +designed to be a teaching language, then you'll be happy to +know that Guido van Rossum designed Python to be simple to +teach to everyone but powerful enough to implement real world +applications. Python makes a good language for first time +programmers because that was one of Python's design goals. +There are papers at http://www.python.org/doc/essays/ on the Python website +by Python's creator explaining his objectives for the language. +One that may interest you is titled "Computer Programming for Everybody" +http://www.python.org/doc/essays/cp4e.html +

+If you're seriously considering Python as a language for your +school, Guido van Rossum may even be willing to correspond with +you about how the language would fit in your curriculum. +See http://www.python.org/doc/FAQ.html#2.2 for examples of +Python's use in the "real world." +

+While Python, its source code, and its IDEs are freely +available, this consideration should not rule +out other languages. There are other free languages (Java, +free C compilers), and many companies are willing to waive some +or all of their fees for student programming tools if it +guarantees that a whole graduating class will know how to +use their tools. That is, if one of the requirements for +the language that will be taught is that it be freely +available, then Python qualifies, but this requirement +does not preclude other languages. +

+While Python jobs may not be as prevalent as C/C++/Java jobs, +teachers should not worry about teaching students critical job +skills in their first course. The skills that win students a +job are those they learn in their senior classes and internships. +Their first programming courses are there to lay a solid +foundation in programming fundamentals. The primary question +in choosing the language for such a course should be which +language permits the students to learn this material without +hindering or limiting them. +

+Another argument for Python is that there are many tasks for +which something like C++ is overkill. That's where languages +like Python, Perl, Tcl, and Visual Basic thrive. It's critical +for students to know something about these languages. (Every +employer for whom I've worked used at least one such language.) +Of the languages listed above, Python probably makes the best +language in a programming curriculum since its syntax is simple, +consistent, and not unlike other languages (C/C++/Java) that +are probably in the curriculum. By starting students with +Python, a department simultaneously lays the foundations for +other programming courses and introduces students to the type +of language that is often used as a "glue" language. As an +added bonus, Python can be used to interface with Microsoft's +COM components (thanks to Mark Hammond). There is also Jython, +a Java implementation of the Python interpreter, that can be +used to connect Java components. +

+If you currently start students with Pascal or C/C++ or Java, +you may be worried they will have trouble learning a statically +typed language after starting with Python. I think that this +fear most often stems from the fact that the teacher started +with a statically typed language, and we tend to like to teach +others in the same way we were taught. In reality, the +transition from Python to one of these other languages is +quite simple. +

+To motivate a statically typed language such as C++, begin the +course by explaining that unlike Python, their first language, +C++ is compiled to a machine dependent executable. Explain +that the point is to make a very fast executable. To permit +the compiler to make optimizations, programmers must help it +by specifying the "types" of variables. By restricting each +variable to a specific type, the compiler can reduce the +book-keeping it has to do to permit dynamic types. The compiler +also has to resolve references at compile time. Thus, the +language gains speed by sacrificing some of Python's dynamic +features. Then again, the C++ compiler provides type safety +and catches many bugs at compile time instead of run time (a +critical consideration for many commercial applications). C++ +is also designed for very large programs where one may want to +guarantee that others don't touch an object's implementation. +C++ provides very strong language features to separate an object's +implementation from its interface. Explain why this separation +is a good thing. +

+The first day of a C++ course could then be a whirlwind introduction +to what C++ requires and provides. The point here is that after +a semester or two of Python, students are hopefully competent +programmers. They know how to handle loops and write procedures. +They've also worked with objects, thought about the benefits of +consistent interfaces, and used the technique of subclassing to +specialize behavior. Thus, a whirlwind introduction to C++ could +show them how objects and subclassing looks in C++. The +potentially difficult concepts of object-oriented design were +taught without the additional obstacles presented by a language +such as C++ or Java. When learning one of these languages, +the students would already understand the "road map." They +understand objects; they would just be learning how objects +fit in a statically typed languages. Language requirements +and compiler errors that seem unnatural to beginning programmers +make sense in this new context. Many students will find it +helpful to be able to write a fast prototype of their algorithms +in Python. Thus, they can test and debug their ideas before +they attempt to write the code in the new language, saving the +effort of working with C++ types for when they've discovered a +working solution for their assignments. When they get annoyed +with the rigidity of types, they'll be happy to learn about +containers and templates to regain some of the lost flexibility +Python afforded them. Students may also gain an appreciation +for the fact that no language is best for every task. They'll +see that C++ is faster, but they'll know that they can gain +flexibility and development speed with a Python when execution +speed isn't critical. +

+If you have any concerns that weren't addressed here, try +posting to the Python newsgroup. Others there have done some +work with using Python as an instructional tool. Good luck. +We'd love to hear about it if you choose Python for your course. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 2 19:32:35 2002 by +Bill Sconce +

+ +

+

3. Building Python and Other Known Bugs

+ +

+

3.1. Is there a test set?

+Sure. You can run it after building with "make test", or you can +run it manually with this command at the Python prompt: +

+

+ import test.autotest
+

+In Python 1.4 or earlier, use +

+

+ import autotest
+

+The test set doesn't test all features of Python, +but it goes a long way to confirm that Python is actually working. +

+NOTE: if "make test" fails, don't just mail the output to the +newsgroup -- this doesn't give enough information to debug the +problem. Instead, find out which test fails, and run that test +manually from an interactive interpreter. For example, if +"make test" reports that test_spam fails, try this interactively: +

+

+ import test.test_spam
+

+This generally produces more verbose output which can be diagnosed +to debug the problem. If you find a bug in Python or the libraries, or in the tests, please report this in the Python bug tracker at SourceForge: +

+http://sourceforge.net/tracker/?func=add&group_id=5470&atid=105470 +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:29:36 2001 by +Fred Drake +

+ +

+

3.2. When running the test set, I get complaints about floating point operations, but when playing with floating point operations I cannot find anything wrong with them.

+The test set makes occasional unwarranted assumptions about the +semantics of C floating point operations. Until someone donates a +better floating point test set, you will have to comment out the +offending floating point tests and execute similar tests manually. +

+ +Edit this entry / +Log info +

+ +

+

3.3. Link errors after rerunning the configure script.

+It is generally necessary to run "make clean" after a configuration +change. +

+ +Edit this entry / +Log info +

+ +

+

3.4. The python interpreter complains about options passed to a script (after the script name).

+You are probably linking with GNU getopt, e.g. through -liberty. +Don't. The reason for the complaint is that GNU getopt, unlike System +V getopt and other getopt implementations, doesn't consider a +non-option to be the end of the option list. A quick (and compatible) +fix for scripts is to add "--" to the interpreter, like this: +

+

+        #! /usr/local/bin/python --
+

+You can also use this interactively: +

+

+        python -- script.py [options]
+

+Note that a working getopt implementation is provided in the Python +distribution (in Python/getopt.c) but not automatically used. +

+ +Edit this entry / +Log info +

+ +

+

3.5. When building on the SGI, make tries to run python to create glmodule.c, but python hasn't been built or installed yet.

+Comment out the line mentioning glmodule.c in Setup and build a +python without gl first; install it or make sure it is in your $PATH, +then edit the Setup file again to turn on the gl module, and make +again. You don't need to do "make clean"; you do need to run "make +Makefile" in the Modules subdirectory (or just run "make" at the +toplevel). +

+ +Edit this entry / +Log info +

+ +

+

3.6. I use VPATH but some targets are built in the source directory.

+On some systems (e.g. Sun), if the target already exists in the +source directory, it is created there instead of in the build +directory. This is usually because you have previously built without +VPATH. Try running "make clobber" in the source directory. +

+ +Edit this entry / +Log info +

+ +

+

3.7. Trouble building or linking with the GNU readline library.

+You can use the GNU readline library to improve the interactive user +interface: this gives you line editing and command history when +calling python interactively. Its sources are distributed with +Python (at least for 2.0). Uncomment the line +

+#readline readline.c -lreadline -ltermcap +

+in Modules/Setup. The configuration option --with-readline +is no longer supported, at least in Python 2.0. Some hints on +building and using the readline library: +On SGI IRIX 5, you may have to add the following +to rldefs.h: +

+

+        #ifndef sigmask
+        #define sigmask(sig) (1L << ((sig)-1))
+        #endif
+

+On some systems, you will have to add #include "rldefs.h" to the +top of several source files, and if you use the VPATH feature, you +will have to add dependencies of the form foo.o: foo.c to the +Makefile for several values of foo. +The readline library requires use of the termcap library. A +known problem with this is that it contains entry points which +cause conflicts with the STDWIN and SGI GL libraries. The STDWIN +conflict can be solved by adding a line saying '#define werase w_erase' to the +stdwin.h file (in the STDWIN distribution, subdirectory H). The +GL conflict has been solved in the Python configure script by a +hack that forces use of the static version of the termcap library. +Check the newsgroup gnu.bash.bug news:gnu.bash.bug for +specific problems with the readline library (I don't read this group +but I've been told that it is the place for readline bugs). +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 2 18:23:48 2000 by +Issac Trotts +

+ +

+

3.8. Trouble with socket I/O on older Linux 1.x versions.

+Once you've built Python, use it to run the regen script in the +Lib/plat-linux2 directory. Apparently the files as distributed don't match the system headers on some Linux versions. +

+Note that this FAQ entry only applies to Linux kernel versions 1.x.y; +these are hardly around any more. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 30 20:05:52 2002 by +Jens Kubieziel +

+ +

+

3.9. Trouble with prototypes on Ultrix.

+Ultrix cc seems broken -- use gcc, or edit config.h to #undef +HAVE_PROTOTYPES. +

+ +Edit this entry / +Log info +

+ +

+

3.10. Other trouble building Python on platform X.

+Please submit the details to the SourceForge bug tracker: +

+

+  http://sourceforge.net/tracker/?group_id=5470&atid=105470
+

+and we'll look +into it. Please provide as many details as possible. In particular, +if you don't tell us what type of computer and what operating system +(and version) you are using it will be difficult for us to figure out +what is the matter. If you have compilation output logs, +please use file uploads -- don't paste everything in the message box. +

+In many cases, we won't have access to the same hardware or operating system version, so please, if you have a SourceForge account, log in before filing your report, or if you don't have an account, include an email address at which we can reach you for further questions. Logging in to SourceForge first will also cause SourceForge to send you updates as we act on your report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:53:18 2001 by +Fred Drake +

+ +

+

3.11. How to configure dynamic loading on Linux.

+This is now automatic as long as your Linux version uses the ELF +object format (all recent Linuxes do). +

+ +Edit this entry / +Log info +

+ +

+

3.12. I can't get shared modules to work on Linux 2.0 (Slackware96)?

+This is a bug in the Slackware96 release. The fix is simple: Make sure +that there is a link from /lib/libdl.so to /lib/libdl.so.1 so that the +following links are setup: /lib/libdl.so -> /lib/libdl.so.1 +/lib/libdl.so.1 -> /lib/libdl.so.1.7.14 You may have to rerun the +configure script, after rm'ing the config.cache file, before you +attempt to rebuild python after this fix. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:45:03 1997 by +GvR +

+ +

+

3.13. Trouble when making modules shared on Linux.

+This happens when you have built Python for static linking and then +enable +

+  *shared*
+

+in the Setup file. Shared library code must be +compiled with "-fpic". If a .o file for the module already exist that +was compiled for static linking, you must remove it or do "make clean" +in the Modules directory. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 13:42:30 1997 by +GvR +

+ +

+

3.14. [deleted]

+[ancient information on threads on linux (when thread support +was not standard) used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 2 17:27:13 2002 by +Erno Kuusela +

+ +

+

3.15. Errors when linking with a shared library containing C++ code.

+Link the main Python binary with C++. Change the definition of +LINKCC in Modules/Makefile to be your C++ compiler. You may have to +edit config.c slightly to make it compilable with C++. +

+ +Edit this entry / +Log info +

+ +

+

3.16. Deleted

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 16:02:22 2001 by +GvR +

+ +

+

3.17. Deleted.

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:54:57 2001 by +GvR +

+ +

+

3.18. Compilation or link errors for the _tkinter module

+Most likely, there's a version mismatch between the Tcl/Tk header +files (tcl.h and tk.h) and the Tcl/Tk libraries you are using e.g. +"-ltk8.0" and "-ltcl8.0" arguments for _tkinter in the Setup file). +It is possible to install several versions of the Tcl/Tk libraries, +but there can only be one version of the tcl.h and tk.h header +files. If the library doesn't match the header, you'll get +problems, either when linking the module, or when importing it. +Fortunately, the version number is clearly stated in each file, +so this is easy to find. Reinstalling and using the latest +version usually fixes the problem. +

+(Also note that when compiling unpatched Python 1.5.1 against +Tcl/Tk 7.6/4.2 or older, you get an error on Tcl_Finalize. See +the 1.5.1 patch page at http://www.python.org/1.5/patches-1.5.1/.) +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:49:14 1998 by +Gvr +

+ +

+

3.19. I configured and built Python for Tcl/Tk but "import Tkinter" fails.

+Most likely, you forgot to enable the line in Setup that says +"TKPATH=:$(DESTLIB)/tkinter". +

+ +Edit this entry / +Log info +

+ +

+

3.20. [deleted]

+[ancient information on a gcc+tkinter bug on alpha was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:46:23 2002 by +Erno Kuusela +

+ +

+

3.21. Several common system calls are missing from the posix module.

+Most likely, all test compilations run by the configure script +are failing for some reason or another. Have a look in config.log to +see what could be the reason. A common reason is specifying a +directory to the --with-readline option that doesn't contain the +libreadline.a file. +

+ +Edit this entry / +Log info +

+ +

+

3.22. ImportError: No module named string, on MS Windows.

+Most likely, your PYTHONPATH environment variable should be set to +something like: +

+set PYTHONPATH=c:\python;c:\python\lib;c:\python\scripts +

+(assuming Python was installed in c:\python) +

+ +Edit this entry / +Log info +

+ +

+

3.23. Core dump on SGI when using the gl module.

+There are conflicts between entry points in the termcap and curses +libraries and an entry point in the GL library. There's a hack of a +fix for the termcap library if it's needed for the GNU readline +library, but it doesn't work when you're using curses. Concluding, +you can't build a Python binary containing both the curses and gl +modules. +

+ +Edit this entry / +Log info +

+ +

+

3.24. "Initializer not a constant" while building DLL on MS-Windows

+Static type object initializers in extension modules may cause compiles to +fail with an error message like "initializer not a constant". +Fredrik Lundh <Fredrik.Lundh@image.combitech.se> explains: +

+This shows up when building DLL under MSVC. There's two ways to +address this: either compile the module as C++, or change your code to +something like: +

+

+  statichere PyTypeObject bstreamtype = {
+      PyObject_HEAD_INIT(NULL) /* must be set by init function */
+      0,
+      "bstream",
+      sizeof(bstreamobject),
+

+

+  ...
+

+

+  void
+  initbstream()
+  {
+      /* Patch object type */
+      bstreamtype.ob_type = &PyType_Type;
+      Py_InitModule("bstream", functions);
+      ...
+  }
+

+

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 14:58:05 1997 by +Aaron Watters +

+ +

+

3.25. Output directed to a pipe or file disappears on Linux.

+Some people have reported that when they run their script +interactively, it runs great, but that when they redirect it +to a pipe or file, no output appears. +

+

+    % python script.py
+    ...some output...
+    % python script.py >file
+    % cat file
+    % # no output
+    % python script.py | cat
+    % # no output
+    %
+

+This was a bug in Linux kernel. It is fixed and should not appear anymore. So most Linux users are not affected by this. +

+If redirection doesn't work on your Linux system, check what shell you are using. Shells like (t)csh doesn't support redirection. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 16 13:38:30 2003 by +Jens Kubieziel +

+ +

+

3.26. [deleted]

+[ancient libc/linux problem was here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:48:08 2002 by +Erno Kuusela +

+ +

+

3.27. [deleted]

+[ancient linux + threads + tk problem was described here] +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 16:49:08 2002 by +Erno Kuusela +

+ +

+

3.28. How can I test if Tkinter is working?

+Try the following: +

+

+  python
+  >>> import _tkinter
+  >>> import Tkinter
+  >>> Tkinter._test()
+

+This should pop up a window with two buttons, +one "Click me" and one "Quit". +

+If the first statement (import _tkinter) fails, your Python +installation probably has not been configured to support Tcl/Tk. +On Unix, if you have installed Tcl/Tk, you have to rebuild Python +after editing the Modules/Setup file to enable the _tkinter module +and the TKPATH environment variable. +

+It is also possible to get complaints about Tcl/Tk version +number mismatches or missing TCL_LIBRARY or TK_LIBRARY +environment variables. These have to do with Tcl/Tk installation +problems. +

+A common problem is to have installed versions of tcl.h and tk.h +that don't match the installed version of the Tcl/Tk libraries; +this usually results in linker errors or (when using dynamic +loading) complaints about missing symbols during loading +the shared library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 28 17:01:46 1997 by +Guido van Rossum +

+ +

+

3.29. Is there a way to get the interactive mode of the python interpreter to perform function/variable name completion?

+(From a posting by Guido van Rossum) +

+On Unix, if you have enabled the readline module (i.e. if Emacs-style +command line editing and bash-style history works for you), you can +add this by importing the undocumented standard library module +"rlcompleter". When completing a simple identifier, it +completes keywords, built-ins and globals in __main__; when completing +NAME.NAME..., it evaluates (!) the expression up to the last dot and +completes its attributes. +

+This way, you can do "import string", type "string.", hit the +completion key twice, and see the list of names defined by the +string module. +

+Tip: to use the tab key as the completion key, call +

+

+    readline.parse_and_bind("tab: complete")
+

+You can put this in a ~/.pythonrc file, and set the PYTHONSTARTUP +environment variable to ~/.pythonrc. This will cause the completion to be enabled +whenever you run Python interactively. +

+Notes (see the docstring for rlcompleter.py for more information): +

+* The evaluation of the NAME.NAME... form may cause arbitrary +application defined code to be executed if an object with a +__getattr__ hook is found. Since it is the responsibility of the +application (or the user) to enable this feature, I consider this an +acceptable risk. More complicated expressions (e.g. function calls or +indexing operations) are not evaluated. +

+* GNU readline is also used by the built-in functions input() and +raw_input(), and thus these also benefit/suffer from the complete +features. Clearly an interactive application can benefit by +specifying its own completer function and using raw_input() for all +its input. +

+* When stdin is not a tty device, GNU readline is never +used, and this module (and the readline module) are silently inactive. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:55:24 1998 by +A.M. Kuchling +

+ +

+

3.30. Why is the Python interpreter not built as a shared library?

+(This is a Unix question; on Mac and Windows, it is a shared +library.) +

+It's just a nightmare to get this to work on all different platforms. +Shared library portability is a pain. And yes, I know about GNU libtool +-- but it requires me to use its conventions for filenames etc, and it +would require a complete and utter rewrite of all the makefile and +config tools I'm currently using. +

+In practice, few applications embed Python -- it's much more common to +have Python extensions, which already are shared libraries. Also, +serious embedders often want total control over which Python version +and configuration they use so they wouldn't want to use a standard +shared library anyway. So while the motivation of saving space +when lots of apps embed Python is nice in theory, I +doubt that it will save much in practice. (Hence the low priority I +give to making a shared library.) +

+For Linux systems, the simplest method of producing libpython1.5.so seems to +be (originally from the Minotaur project web page, +http://www.equi4.com/minotaur/minotaur.html): +

+

+  make distclean 
+  ./configure 
+  make OPT="-fpic -O2" 
+  mkdir .extract 
+  (cd .extract; ar xv ../libpython1.5.a) 
+  gcc -shared -o libpython1.5.so .extract/*.o 
+  rm -rf .extract
+

+In Python 2.3 this will be supported by the standard build routine +(at least on Linux) with --enable-shared. Note however that there +is little advantage, and it slows down Python because of the need +for PIC code and the extra cost at startup time to find the library. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 13:36:55 2002 by +GvR +

+ +

+

3.31. Build with GCC on Solaris 2.6 (SunOS 5.6) fails

+If you have upgraded Solaris 2.5 or 2.5.1 to Solaris 2.6, +but you have not upgraded +your GCC installation, the compile may fail, e.g. like this: +

+

+ In file included from /usr/include/sys/stream.h:26,
+                  from /usr/include/netinet/in.h:38,
+                  from /usr/include/netdb.h:96,
+                  from ./socketmodule.c:121:
+ /usr/include/sys/model.h:32: #error "No DATAMODEL_NATIVE specified"
+

+Solution: rebuild GCC for Solaris 2.6. +You might be able to simply re-run fixincludes, but +people have had mixed success with doing that. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 21 11:18:46 1998 by +GvR +

+ +

+

3.32. Running "make clean" seems to leave problematic files that cause subsequent builds to fail.

+Use "make clobber" instead. +

+Use "make clean" to reduce the size of the source/build directory +after you're happy with your build and installation. +If you have already tried to build python and you'd like to start +over, you should use "make clobber". It does a "make clean" and also +removes files such as the partially built Python library from a previous build. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 24 20:39:26 1999 by +TAB +

+ +

+

3.33. Submitting bug reports and patches

+To report a bug or submit a patch, please use the relevant service +from the Python project at SourceForge. +

+Bugs: http://sourceforge.net/tracker/?group_id=5470&atid=105470 +

+Patches: http://sourceforge.net/tracker/?group_id=5470&atid=305470 +

+If you have a SourceForge account, please log in before submitting your bug report; this will make it easier for us to contact you regarding your report in the event we have follow-up questions. It will also enable SourceForge to send you update information as we act on your bug. If you do not have a SourceForge account, please consider leaving your name and email address as part of the report. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:58:26 2001 by +Fred Drake +

+ +

+

3.34. I can't load shared libraries under Python 1.5.2, Solaris 7, and gcc 2.95.2

+When trying to load shared libraries, you may see errors like: +ImportError: ld.so.1: python: fatal: relocation error: file /usr/local/lib/python1.5/site-packages/Perp/util/du_SweepUtilc.so: +

+ symbol PyExc_RuntimeError: referenced symbol not found
+

+

+There is a problem with the configure script for Python 1.5.2 +under Solaris 7 with gcc 2.95 . configure should set the make variable +LINKFORSHARED=-Xlinker -export-dynamic +

+

+in Modules/Makefile, +

+Manually add this line to the Modules/Makefile. +This builds a Python executable that can load shared library extensions (xxx.so) . +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 19 10:37:05 2001 by +GvR +

+ +

+

3.35. In the regression test, test_all fails for the profile module. What's wrong?

+If you have been using the profile module, and have properly calibrated a copy of the module as described in the documentation for the profiler: +

+http://www.python.org/doc/current/lib/profile-calibration.html +

+then it is possible that the regression test "test___all__" will fail if you run the regression test manually rather than using "make test" in the Python source directory. This will happen if you have set your PYTHONPATH environment variable to include the directory containing your calibrated profile module. You have probably calibrated the profiler using an older version of the profile module which does not define the __all__ value, added to the module as of Python 2.1. +

+The problem can be fixed by removing the old calibrated version of the profile module and using the latest version to do a fresh calibration. In general, you will need to re-calibrate for each version of Python anyway, since the performance characteristics can change in subtle ways that impact profiling. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 27 10:44:10 2001 by +Fred Drake +

+ +

+

3.36. relocations remain against allocatable but non-writable sections

+This linker error occurs on Solaris if you attempt to build an extension module which incorporates position-dependent (non-PIC) code. A common source of problems is that a static library (.a file), such as libreadline.a or libcrypto.a is linked with the extension module. The error specifically occurs when using gcc as the compiler, but /usr/ccs/bin/ld as the linker. +

+The following solutions and work-arounds are known: +

+1. Rebuild the libraries (libreadline, libcrypto) with -fPIC (-KPIC if using the system compiler). This is recommended; all object files in a shared library should be position-independent. +

+2. Statically link the extension module and its libraries into the Python interpreter, by editing Modules/Setup. +

+3. Use GNU ld instead of /usr/ccs/bin/ld; GNU ld will accept non-PIC code in shared libraries (and mark the section writable) +

+4. Pass -mimpure-text to GCC when linking the module. This will force gcc to not pass -z text to ld; in turn, ld will make all text sections writable. +

+Options 3 and 4 are not recommended, since the ability to share code across processes is lost. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 29 12:05:11 2002 by +Martin v. L�wis +

+ +

+

4. Programming in Python

+ +

+

4.1. Is there a source code level debugger with breakpoints, step, etc.?

+Yes. +

+Module pdb is a rudimentary but adequate console-mode debugger for Python. It is part of the standard Python library, and is documented in the Library Reference Manual. (You can also write your own debugger by using the code for pdb as an example.) +

+The IDLE interactive development environment, which is part of the standard Python distribution (normally available in Tools/idle), includes a graphical debugger. There is documentation for the IDLE debugger at http://www.python.org/idle/doc/idle2.html#Debugger +

+Pythonwin is a Python IDE that includes a GUI debugger based on bdb. The Pythonwin debugger colors breakpoints and has quite a few cool features (including debugging non-Pythonwin programs). A reference can be found at http://www.python.org/ftp/python/pythonwin/pwindex.html +More recent versions of PythonWin are available as a part of the ActivePython distribution (see http://www.activestate.com/Products/ActivePython/index.html). +

+Pydb is a version of the standard Python debugger pdb, modified for use with DDD (Data Display Debugger), a popular graphical debugger front end. Pydb can be found at http://packages.debian.org/unstable/devel/pydb.html +and DDD can be found at http://www.gnu.org/software/ddd/ +

+There are a number of commmercial Python IDEs that include graphical debuggers. They include: +

+

+ * Wing IDE (http://wingide.com/) 
+ * Komodo IDE (http://www.activestate.com/Products/Komodo/)
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 28 01:43:41 2003 by +Stephen Ferg +

+ +

+

4.2. Can I create an object class with some methods implemented in C and others in Python (e.g. through inheritance)? (Also phrased as: Can I use a built-in type as base class?)

+In Python 2.2, you can inherit from builtin classes such as int, list, dict, etc. +

+In previous versions of Python, you can easily create a Python class which serves as a wrapper around a built-in object, e.g. (for dictionaries): +

+

+        # A user-defined class behaving almost identical
+        # to a built-in dictionary.
+        class UserDict:
+                def __init__(self): self.data = {}
+                def __repr__(self): return repr(self.data)
+                def __cmp__(self, dict):
+                        if type(dict) == type(self.data):
+                                return cmp(self.data, dict)
+                        else:
+                                return cmp(self.data, dict.data)
+                def __len__(self): return len(self.data)
+                def __getitem__(self, key): return self.data[key]
+                def __setitem__(self, key, item): self.data[key] = item
+                def __delitem__(self, key): del self.data[key]
+                def keys(self): return self.data.keys()
+                def items(self): return self.data.items()
+                def values(self): return self.data.values()
+                def has_key(self, key): return self.data.has_key(key)
+

+A2. See Jim Fulton's ExtensionClass for an example of a mechanism +which allows you to have superclasses which you can inherit from in +Python -- that way you can have some methods from a C superclass (call +it a mixin) and some methods from either a Python superclass or your +subclass. ExtensionClass is distributed as a part of Zope (see +http://www.zope.org), but will be phased out with Zope 3, since +Zope 3 uses Python 2.2 or later which supports direct inheritance +from built-in types. Here's a link to the original paper about +ExtensionClass: +http://debian.acm.ndsu.nodak.edu/doc/python-extclass/ExtensionClass.html +

+A3. The Boost Python Library (BPL, http://www.boost.org/libs/python/doc/index.html) +provides a way of doing this from C++ (i.e. you can inherit from an +extension class written in C++ using the BPL). +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 21:09:52 2002 by +GvR +

+ +

+

4.3. Is there a curses/termcap package for Python?

+The standard Python source distribution comes with a curses module in +the Modules/ subdirectory, though it's not compiled by default (note +that this is not available in the Windows distribution -- there is +no curses module for Windows). +

+In Python versions before 2.0 the module only supported plain curses; +you couldn't use ncurses features like colors with it (though it would +link with ncurses). +

+In Python 2.0, the curses module has been greatly extended, starting +from Oliver Andrich's enhanced version, to provide many additional +functions from ncurses and SYSV curses, such as colour, alternative +character set support, pads, and mouse support. This means the +module is no longer compatible with operating systems that only +have BSD curses, but there don't seem to be any currently +maintained OSes that fall into this category. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 23 20:24:06 2002 by +Tim Peters +

+ +

+

4.4. Is there an equivalent to C's onexit() in Python?

+For Python 2.0: The new atexit module provides a register function that +is similar to C's onexit. See the Library Reference for details. For +2.0 you should not assign to sys.exitfunc! +

+For Python 1.5.2: You need to import sys and assign a function to +sys.exitfunc, it will be called when your program exits, is +killed by an unhandled exception, or (on UNIX) receives a +SIGHUP or SIGTERM signal. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:14:55 2000 by +Bjorn Pettersen +

+ +

+

4.5. [deleted]

+[python used to lack nested scopes, it was explained here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:18:22 2002 by +Erno Kuusela +

+ +

+

4.6. How do I iterate over a sequence in reverse order?

+If it is a list, the fastest solution is +

+

+        list.reverse()
+        try:
+                for x in list:
+                        "do something with x"
+        finally:
+                list.reverse()
+

+This has the disadvantage that while you are in the loop, the list +is temporarily reversed. If you don't like this, you can make a copy. +This appears expensive but is actually faster than other solutions: +

+

+        rev = list[:]
+        rev.reverse()
+        for x in rev:
+                <do something with x>
+

+If it's not a list, a more general but slower solution is: +

+

+        for i in range(len(sequence)-1, -1, -1):
+                x = sequence[i]
+                <do something with x>
+

+A more elegant solution, is to define a class which acts as a sequence +and yields the elements in reverse order (solution due to Steve +Majewski): +

+

+        class Rev:
+                def __init__(self, seq):
+                        self.forw = seq
+                def __len__(self):
+                        return len(self.forw)
+                def __getitem__(self, i):
+                        return self.forw[-(i + 1)]
+

+You can now simply write: +

+

+        for x in Rev(list):
+                <do something with x>
+

+Unfortunately, this solution is slowest of all, due to the method +call overhead... +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 21:10:50 1997 by +GvR +

+ +

+

4.7. My program is too slow. How do I speed it up?

+That's a tough one, in general. There are many tricks to speed up +Python code; I would consider rewriting parts in C only as a last +resort. One thing to notice is that function and (especially) method +calls are rather expensive; if you have designed a purely OO interface +with lots of tiny functions that don't do much more than get or set an +instance variable or call another method, you may consider using a +more direct way, e.g. directly accessing instance variables. Also see +the standard module "profile" (described in the Library Reference +manual) which makes it possible to find out where +your program is spending most of its time (if you have some patience +-- the profiling itself can slow your program down by an order of +magnitude). +

+Remember that many standard optimization heuristics you +may know from other programming experience may well apply +to Python. For example it may be faster to send output to output +devices using larger writes rather than smaller ones in order to +avoid the overhead of kernel system calls. Thus CGI scripts +that write all output in "one shot" may be notably faster than +those that write lots of small pieces of output. +

+Also, be sure to use "aggregate" operations where appropriate. +For example the "slicing" feature allows programs to chop up +lists and other sequence objects in a single tick of the interpreter +mainloop using highly optimized C implementations. Thus to +get the same effect as +

+

+  L2 = []
+  for i in range[3]:
+       L2.append(L1[i])
+

+it is much shorter and far faster to use +

+

+  L2 = list(L1[:3]) # "list" is redundant if L1 is a list.
+

+Note that the map() function, particularly used with +builtin methods or builtin functions can be a convenient +accelerator. For example to pair the elements of two +lists together: +

+

+  >>> map(None, [1,2,3], [4,5,6])
+  [(1, 4), (2, 5), (3, 6)]
+

+or to compute a number of sines: +

+

+  >>> map( math.sin, (1,2,3,4))
+  [0.841470984808, 0.909297426826, 0.14112000806,   -0.756802495308]
+

+The map operation completes very quickly in such cases. +

+Other examples of aggregate operations include the join and split +methods of string objects. For example if s1..s7 are large (10K+) strings then +"".join([s1,s2,s3,s4,s5,s6,s7]) may be far faster than +the more obvious s1+s2+s3+s4+s5+s6+s7, since the "summation" +will compute many subexpressions, whereas join does all +copying in one pass. For manipulating strings also consider the +regular expression libraries and the "substitution" operations +String % tuple and String % dictionary. Also be sure to use +the list.sort builtin method to do sorting, and see FAQ's 4.51 +and 4.59 for examples of moderately advanced usage -- list.sort beats +other techniques for sorting in all but the most extreme +circumstances. +

+There are many other aggregate operations +available in the standard libraries and in contributed libraries +and extensions. +

+Another common trick is to "push loops into functions or methods." +For example suppose you have a program that runs slowly and you +use the profiler (profile.run) to determine that a Python function ff +is being called lots of times. If you notice that ff +

+

+   def ff(x):
+       ...do something with x computing result...
+       return result
+

+tends to be called in loops like (A) +

+

+   list = map(ff, oldlist)
+

+or (B) +

+

+   for x in sequence:
+       value = ff(x)
+       ...do something with value...
+

+then you can often eliminate function call overhead by rewriting +ff to +

+

+   def ffseq(seq):
+       resultseq = []
+       for x in seq:
+           ...do something with x computing result...
+           resultseq.append(result)
+       return resultseq
+

+and rewrite (A) to +

+

+    list = ffseq(oldlist)
+

+and (B) to +

+

+    for value in ffseq(sequence):
+        ...do something with value...
+

+Other single calls ff(x) translate to ffseq([x])[0] with little +penalty. Of course this technique is not always appropriate +and there are other variants, which you can figure out. +

+You can gain some performance by explicitly storing the results of +a function or method lookup into a local variable. A loop like +

+

+    for key in token:
+        dict[key] = dict.get(key, 0) + 1
+

+resolves dict.get every iteration. If the method isn't going to +change, a faster implementation is +

+

+    dict_get = dict.get  # look up the method once
+    for key in token:
+        dict[key] = dict_get(key, 0) + 1
+

+Default arguments can be used to determine values once, at +compile time instead of at run time. This can only be done for +functions or objects which will not be changed during program +execution, such as replacing +

+

+    def degree_sin(deg):
+        return math.sin(deg * math.pi / 180.0)
+

+with +

+

+    def degree_sin(deg, factor = math.pi/180.0, sin = math.sin):
+        return sin(deg * factor)
+

+Because this trick uses default arguments for terms which should +not be changed, it should only be used when you are not concerned +with presenting a possibly confusing API to your users. +

+

+For an anecdote related to optimization, see +

+

+	http://www.python.org/doc/essays/list2str.html
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:03:54 2002 by +Neal Norwitz +

+ +

+

4.8. When I have imported a module, then edit it, and import it again (into the same Python process), the changes don't seem to take place. What is going on?

+For reasons of efficiency as well as consistency, Python only reads +the module file on the first time a module is imported. (Otherwise a +program consisting of many modules, each of which imports the same +basic module, would read the basic module over and over again.) To +force rereading of a changed module, do this: +

+

+        import modname
+        reload(modname)
+

+Warning: this technique is not 100% fool-proof. In particular, +modules containing statements like +

+

+        from modname import some_objects
+

+will continue to work with the old version of the imported objects. +

+ +Edit this entry / +Log info +

+ +

+

4.9. How do I find the current module name?

+A module can find out its own module name by looking at the +(predefined) global variable __name__. If this has the value +'__main__' you are running as a script. +

+ +Edit this entry / +Log info +

+ +

+

4.10. I have a module in which I want to execute some extra code when it is run as a script. How do I find out whether I am running as a script?

+See the previous question. E.g. if you put the following on the +last line of your module, main() is called only when your module is +running as a script: +

+

+        if __name__ == '__main__': main()
+

+

+ +Edit this entry / +Log info +

+ +

+

4.11. I try to run a program from the Demo directory but it fails with ImportError: No module named ...; what gives?

+This is probably an optional module (written in C!) which hasn't +been configured on your system. This especially happens with modules +like "Tkinter", "stdwin", "gl", "Xt" or "Xm". For Tkinter, STDWIN and +many other modules, see Modules/Setup.in for info on how to add these +modules to your Python, if it is possible at all. Sometimes you will +have to ftp and build another package first (e.g. Tcl and Tk for Tkinter). +Sometimes the module only works on specific platforms (e.g. gl only works +on SGI machines). +

+NOTE: if the complaint is about "Tkinter" (upper case T) and you have +already configured module "tkinter" (lower case t), the solution is +not to rename tkinter to Tkinter or vice versa. There is probably +something wrong with your module search path. Check out the value of +sys.path. +

+For X-related modules (Xt and Xm) you will have to do more work: they +are currently not part of the standard Python distribution. You will +have to ftp the Extensions tar file, i.e. +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz and follow +the instructions there. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 21:31:08 2003 by +Jens Kubieziel +

+ +

+

4.12. [deleted]

+[stdwin (long dead windowing library) entry deleted] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:30:13 2002 by +Erno Kuusela +

+ +

+

4.13. What GUI toolkits exist for Python?

+Depending on what platform(s) you are aiming at, there are several. +

+Currently supported solutions: +

+Cross-platform: +

+Tk: +

+There's a neat object-oriented interface to the Tcl/Tk widget set, +called Tkinter. It is part of the standard Python distribution and +well-supported -- all you need to do is build and install Tcl/Tk and +enable the _tkinter module and the TKPATH definition in Modules/Setup +when building Python. This is probably the easiest to install and +use, and the most complete widget set. It is also very likely that in +the future the standard Python GUI API will be based on or at least +look very much like the Tkinter interface. For more info about Tk, +including pointers to the source, see the Tcl/Tk home page at +http://www.scriptics.com. Tcl/Tk is now fully +portable to the Mac and Windows platforms (NT and 95 only); you need +Python 1.4beta3 or later and Tk 4.1patch1 or later. +

+wxWindows: +

+There's an interface to wxWindows called wxPython. wxWindows is a +portable GUI class library written in C++. It supports GTK, Motif, +MS-Windows and Mac as targets. Ports to other platforms are being +contemplated or have already had some work done on them. wxWindows +preserves the look and feel of the underlying graphics toolkit, and +there is quite a rich widget set and collection of GDI classes. +See the wxWindows page at http://www.wxwindows.org/ for more details. +wxPython is a python extension module that wraps many of the wxWindows +C++ classes, and is quickly gaining popularity amongst Python +developers. You can get wxPython as part of the source or CVS +distribution of wxWindows, or directly from its home page at +http://alldunn.com/wxPython/. +

+Gtk+: +

+PyGtk bindings for the Gtk+ Toolkit by James Henstridge exist; see ftp://ftp.daa.com.au/pub/james/python/. Note that there are two incompatible bindings. If you are using Gtk+ 1.2.x you should get the 0.6.x PyGtk bindings from +

+

+    ftp://ftp.gtk.org/pub/python/v1.2
+

+If you plan to use Gtk+ 2.0 with Python (highly recommended if you are just starting with Gtk), get the most recent distribution from +

+

+    ftp://ftp.gtk.org/pub/python/v2.0
+

+If you are adventurous, you can also check out the source from the Gnome CVS repository. Set your CVS directory to :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome and check the gnome-python module out from the repository. +

+Other: +

+There are also bindings available for the Qt toolkit (PyQt), and for KDE (PyKDE); see http://www.thekompany.com/projects/pykde/. +

+For OpenGL bindings, see http://starship.python.net/~da/PyOpenGL. +

+Platform specific: +

+The Mac port has a rich and ever-growing set of modules that support +the native Mac toolbox calls. See the documentation that comes with +the Mac port. See ftp://ftp.python.org/pub/python/mac. Support +by Jack Jansen jack@cwi.nl. +

+Pythonwin by Mark Hammond (MHammond@skippinet.com.au) +includes an interface to the Microsoft Foundation +Classes and a Python programming environment using it that's written +mostly in Python. See http://www.python.org/windows/. +

+There's an object-oriented GUI based on the Microsoft Foundation +Classes model called WPY, supported by Jim Ahlstrom jim@interet.com. +Programs written in WPY run unchanged and with native look and feel on +Windows NT/95, Windows 3.1 (using win32s), and on Unix (using Tk). +Source and binaries for Windows and Linux are available in +ftp://ftp.python.org/pub/python/wpy/. +

+Obsolete or minority solutions: +

+There's an interface to X11, including the Athena and Motif widget +sets (and a few individual widgets, like Mosaic's HTML widget and +SGI's GL widget) available from +ftp://ftp.python.org/pub/python/src/X-extension.tar.gz. +Support by Sjoerd Mullender sjoerd@cwi.nl. +

+On top of the X11 interface there's the vpApp +toolkit by Per Spilling, now also maintained by Sjoerd Mullender +sjoerd@cwi.nl. See ftp://ftp.cwi.nl/pub/sjoerd/vpApp.tar.gz. +

+For SGI IRIX only, there are unsupported interfaces to the complete +GL (Graphics Library -- low level but very good 3D capabilities) as +well as to FORMS (a buttons-and-sliders-etc package built on top of GL +by Mark Overmars -- ftp'able from +ftp://ftp.cs.ruu.nl/pub/SGI/FORMS/). This is probably also +becoming obsolete, as OpenGL takes over (see above). +

+There's an interface to STDWIN, a platform-independent low-level +windowing interface for Mac and X11. This is totally unsupported and +rapidly becoming obsolete. The STDWIN sources are at +ftp://ftp.cwi.nl/pub/stdwin/. +

+There is an interface to WAFE, a Tcl interface to the X11 +Motif and Athena widget sets. WAFE is at +http://www.wu-wien.ac.at/wafe/wafe.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 13 21:40:39 2002 by +Skip Montanaro +

+ +

+

4.14. Are there any interfaces to database packages in Python?

+Yes! See the Database Topic Guide at +http://www.python.org/topics/database/ for details. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 4 20:12:19 2000 by +Barney Warplug +

+ +

+

4.15. Is it possible to write obfuscated one-liners in Python?

+Yes. See the following three examples, due to Ulf Bartelt: +

+

+        # Primes < 1000
+        print filter(None,map(lambda y:y*reduce(lambda x,y:x*y!=0,
+        map(lambda x,y=y:y%x,range(2,int(pow(y,0.5)+1))),1),range(2,1000)))
+

+

+        # First 10 Fibonacci numbers
+        print map(lambda x,f=lambda x,f:(x<=1) or (f(x-1,f)+f(x-2,f)): f(x,f),
+        range(10))
+

+

+        # Mandelbrot set
+        print (lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,
+        Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,Sy=Sy,L=lambda yc,Iu=Iu,Io=Io,Ru=Ru,Ro=Ro,i=IM,
+        Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,
+        i=i,Sx=Sx,F=lambda xc,yc,x,y,k,f=lambda xc,yc,x,y,k,f:(k<=0)or (x*x+y*y
+        >=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr(
+        64+F(Ru+x*(Ro-Ru)/Sx,yc,0,0,i)),range(Sx))):L(Iu+y*(Io-Iu)/Sy),range(Sy
+        ))))(-2.1, 0.7, -1.2, 1.2, 30, 80, 24)
+        #    \___ ___/  \___ ___/  |   |   |__ lines on screen
+        #        V          V      |   |______ columns on screen
+        #        |          |      |__________ maximum of "iterations"
+        #        |          |_________________ range on y axis
+        #        |____________________________ range on x axis
+

+Don't try this at home, kids! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:48:33 1997 by +GvR +

+ +

+

4.16. Is there an equivalent of C's "?:" ternary operator?

+Not directly. In many cases you can mimic a?b:c with "a and b or +c", but there's a flaw: if b is zero (or empty, or None -- anything +that tests false) then c will be selected instead. In many cases you +can prove by looking at the code that this can't happen (e.g. because +b is a constant or has a type that can never be false), but in general +this can be a problem. +

+Tim Peters (who wishes it was Steve Majewski) suggested the following +solution: (a and [b] or [c])[0]. Because [b] is a singleton list it +is never false, so the wrong path is never taken; then applying [0] to +the whole thing gets the b or c that you really wanted. Ugly, but it +gets you there in the rare cases where it is really inconvenient to +rewrite your code using 'if'. +

+As a last resort it is possible to implement the "?:" operator as a function: +

+

+    def q(cond,on_true,on_false):
+        from inspect import isfunction
+

+

+        if cond:
+            if not isfunction(on_true): return on_true
+            else: return apply(on_true)
+        else:
+            if not isfunction(on_false): return on_false 
+            else: return apply(on_false)
+

+In most cases you'll pass b and c directly: q(a,b,c). To avoid evaluating b +or c when they shouldn't be, encapsulate them +within a lambda function, e.g.: q(a,lambda: b, lambda: c). +

+

+

+It has been asked why Python has no if-then-else expression, +since most language have one; it is a frequently requested feature. +

+There are several possible answers: just as many languages do +just fine without one; it can easily lead to less readable code; +no sufficiently "Pythonic" syntax has been discovered; a search +of the standard library found remarkably few places where using an +if-then-else expression would make the code more understandable. +

+Nevertheless, in an effort to decide once and for all whether +an if-then-else expression should be added to the language, +PEP 308 (http://www.python.org/peps/pep-0308.html) has been +put forward, proposing a specific syntax. The community can +now vote on this issue. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 19:41:13 2003 by +David Goodger +

+ +

+

4.17. My class defines del but it is not called when I delete the object.

+There are several possible reasons for this. +

+The del statement does not necessarily call __del__ -- it simply +decrements the object's reference count, and if this reaches zero +__del__ is called. +

+If your data structures contain circular links (e.g. a tree where +each child has a parent pointer and each parent has a list of +children) the reference counts will never go back to zero. You'll +have to define an explicit close() method which removes those +pointers. Please don't ever call __del__ directly -- __del__ should +call close() and close() should make sure that it can be called more +than once for the same object. +

+If the object has ever been a local variable (or argument, which is +really the same thing) to a function that caught an expression in an +except clause, chances are that a reference to the object still exists +in that function's stack frame as contained in the stack trace. +Normally, deleting (better: assigning None to) sys.exc_traceback will +take care of this. If a stack was printed for an unhandled +exception in an interactive interpreter, delete sys.last_traceback +instead. +

+There is code that deletes all objects when the interpreter exits, +but it is not called if your Python has been configured to support +threads (because other threads may still be active). You can define +your own cleanup function using sys.exitfunc (see question 4.4). +

+Finally, if your __del__ method raises an exception, a warning message is printed to sys.stderr. +

+

+Starting with Python 2.0, a garbage collector periodically reclaims the space used by most cycles with no external references. (See the "gc" module documentation for details.) There are, however, pathological cases where it can be expected to fail. Moreover, the garbage collector runs some time after the last reference to your data structure vanishes, so your __del__ method may be called at an inconvenient and random time. This is inconvenient if you're trying to reproduce a problem. Worse, the order in which object's __del__ methods are executed is arbitrary. +

+Another way to avoid cyclical references is to use the "weakref" module, which allows you to point to objects without incrementing their reference count. Tree data structures, for instance, should use weak references for their parent and sibling pointers (if they need them!). +

+Question 6.14 is intended to explain the new garbage collection algorithm. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:27:28 2002 by +Matthias Urlichs +

+ +

+

4.18. How do I change the shell environment for programs called using os.popen() or os.system()? Changing os.environ doesn't work.

+You must be using either a version of python before 1.4, or on a +(rare) system that doesn't have the putenv() library function. +

+Before Python 1.4, modifying the environment passed to subshells was +left out of the interpreter because there seemed to be no +well-established portable way to do it (in particular, some systems, +have putenv(), others have setenv(), and some have none at all). As +of Python 1.4, almost all Unix systems do have putenv(), and so does +the Win32 API, and thus the os module was modified so that changes to +os.environ are trapped and the corresponding putenv() call is made. +

+ +Edit this entry / +Log info +

+ +

+

4.19. What is a class?

+A class is the particular object type created by executing +a class statement. Class objects are used as templates, to create +instance objects, which embody both the data structure +(attributes) and program routines (methods) specific to a datatype. +

+A class can be based on one or more other classes, called its base +class(es). It then inherits the attributes and methods of its base classes. This allows an object model to be successively refined +by inheritance. +

+The term "classic class" is used to refer to the original +class implementation in Python. One problem with classic +classes is their inability to use the built-in data types +(such as list and dictionary) as base classes. Starting +with Python 2.2 an attempt is in progress to unify user-defined +classes and built-in types. It is now possible to declare classes +that inherit from built-in types. +

+ +Edit this entry / +Log info + +/ Last changed on Mon May 27 01:31:21 2002 by +Steve Holden +

+ +

+

4.20. What is a method?

+A method is a function that you normally call as +x.name(arguments...) for some object x. The term is used for methods +of classes and class instances as well as for methods of built-in +objects. (The latter have a completely different implementation and +only share the way their calls look in Python code.) Methods of +classes (and class instances) are defined as functions inside the +class definition. +

+ +Edit this entry / +Log info +

+ +

+

4.21. What is self?

+Self is merely a conventional name for the first argument of a +method -- i.e. a function defined inside a class definition. A method +defined as meth(self, a, b, c) should be called as x.meth(a, b, c) for +some instance x of the class in which the definition occurs; +the called method will think it is called as meth(x, a, b, c). +

+ +Edit this entry / +Log info +

+ +

+

4.22. What is an unbound method?

+An unbound method is a method defined in a class that is not yet +bound to an instance. You get an unbound method if you ask for a +class attribute that happens to be a function. You get a bound method +if you ask for an instance attribute. A bound method knows which +instance it belongs to and calling it supplies the instance automatically; +an unbound method only knows which class it wants for its first +argument (a derived class is also OK). Calling an unbound method +doesn't "magically" derive the first argument from the context -- you +have to provide it explicitly. +

+Trivia note regarding bound methods: each reference to a bound +method of a particular object creates a bound method object. If you +have two such references (a = inst.meth; b = inst.meth), they will +compare equal (a == b) but are not the same (a is not b). +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 6 18:07:25 1998 by +Clarence Gardner +

+ +

+

4.23. How do I call a method defined in a base class from a derived class that overrides it?

+If your class definition starts with "class Derived(Base): ..." +then you can call method meth defined in Base (or one of Base's base +classes) as Base.meth(self, arguments...). Here, Base.meth is an +unbound method (see previous question). +

+ +Edit this entry / +Log info +

+ +

+

4.24. How do I call a method from a base class without using the name of the base class?

+DON'T DO THIS. REALLY. I MEAN IT. It appears that you could call +self.__class__.__bases__[0].meth(self, arguments...) but this fails when +a doubly-derived method is derived from your class: for its instances, +self.__class__.__bases__[0] is your class, not its base class -- so +(assuming you are doing this from within Derived.meth) you would start +a recursive call. +

+Often when you want to do this you are forgetting that classes +are first class in Python. You can "point to" the class you want +to delegate an operation to either at the instance or at the +subclass level. For example if you want to use a "glorp" +operation of a superclass you can point to the right superclass +to use. +

+

+  class subclass(superclass1, superclass2, superclass3):
+      delegate_glorp = superclass2
+      ...
+      def glorp(self, arg1, arg2):
+            ... subclass specific stuff ...
+            self.delegate_glorp.glorp(self, arg1, arg2)
+       ...
+

+

+  class subsubclass(subclass):
+       delegate_glorp = superclass3
+       ...
+

+Note, however that setting delegate_glorp to subclass in +subsubclass would cause an infinite recursion on subclass.delegate_glorp. Careful! Maybe you are getting too fancy for your own good. Consider simplifying the design (?). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 28 13:58:22 1997 by +aaron watters +

+ +

+

4.25. How can I organize my code to make it easier to change the base class?

+You could define an alias for the base class, assign the real base +class to it before your class definition, and use the alias throughout +your class. Then all you have to change is the value assigned to the +alias. Incidentally, this trick is also handy if you want to decide +dynamically (e.g. depending on availability of resources) which base +class to use. Example: +

+

+        BaseAlias = <real base class>
+        class Derived(BaseAlias):
+                def meth(self):
+                        BaseAlias.meth(self)
+                        ...
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 15:49:57 1997 by +GvR +

+ +

+

4.26. How can I find the methods or attributes of an object?

+This depends on the object type. +

+For an instance x of a user-defined class, instance attributes are +found in the dictionary x.__dict__, and methods and attributes defined +by its class are found in x.__class__.__bases__[i].__dict__ (for i in +range(len(x.__class__.__bases__))). You'll have to walk the tree of +base classes to find all class methods and attributes. +

+Many, but not all built-in types define a list of their method names +in x.__methods__, and if they have data attributes, their names may be +found in x.__members__. However this is only a convention. +

+For more information, read the source of the standard (but +undocumented) module newdir. +

+ +Edit this entry / +Log info +

+ +

+

4.27. I can't seem to use os.read() on a pipe created with os.popen().

+os.read() is a low-level function which takes a file descriptor (a +small integer). os.popen() creates a high-level file object -- the +same type used for sys.std{in,out,err} and returned by the builtin +open() function. Thus, to read n bytes from a pipe p created with +os.popen(), you need to use p.read(n). +

+ +Edit this entry / +Log info +

+ +

+

4.28. How can I create a stand-alone binary from a Python script?

+Even though there are Python compilers being developed, +you probably don't need a real compiler, if all you want +is a stand-alone program. There are three solutions to that. +

+One is to use the freeze tool, which is included in the Python +source tree as Tools/freeze. It converts Python byte +code to C arrays. Using a C compiler, you can embed all +your modules into a new program, which is then linked +with the standard Python modules. +

+It works by scanning your source recursively for import statements +(in both forms) and looking for the modules in the standard Python path +as well as in the source directory (for built-in modules). It then +1 the modules written in Python to C code (array initializers +that can be turned into code objects using the marshal module) and +creates a custom-made config file that only contains those built-in +modules which are actually used in the program. It then compiles the +generated C code and links it with the rest of the Python interpreter +to form a self-contained binary which acts exactly like your script. +

+(Hint: the freeze program only works if your script's filename ends in +".py".) +

+There are several utilities which may be helpful. The first is Gordon McMillan's installer at +

+

+    http://www.mcmillan-inc.com/install1.html
+

+which works on Windows, Linux and at least some forms of Unix. +

+Another is Thomas Heller's py2exe (Windows only) at +

+

+    http://starship.python.net/crew/theller/py2exe/
+

+A third is Christian Tismer's SQFREEZE +(http://starship.python.net/crew/pirx/) which appends the byte code +to a specially-prepared Python interpreter, which +will find the byte code in executable. +

+A fourth is Fredrik Lundh's Squeeze +(http://www.pythonware.com/products/python/squeeze/). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jun 19 14:01:30 2002 by +Gordon McMillan +

+ +

+

4.29. What WWW tools are there for Python?

+See the chapters titled "Internet Protocols and Support" and +"Internet Data Handling" in the Library Reference +Manual. Python is full of good things which will help you build server-side and client-side web systems. +

+A summary of available frameworks is maintained by Paul Boddie at +

+

+    http://thor.prohosting.com/~pboddie/Python/web_modules.html
+

+Cameron Laird maintains a useful set of pages about Python web technologies at +

+

+   http://starbase.neosoft.com/~claird/comp.lang.python/web_python.html/
+

+There was a web browser written in Python, called Grail -- +see http://sourceforge.net/project/grail/. This project has been terminated; http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/grail/grail/README gives more details. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 11 22:48:25 2002 by +GvR +

+ +

+

4.30. How do I run a subprocess with pipes connected to both input and output?

+Use the standard popen2 module. For example: +

+

+	import popen2
+	fromchild, tochild = popen2.popen2("command")
+	tochild.write("input\n")
+	tochild.flush()
+	output = fromchild.readline()
+

+Warning: in general, it is unwise to +do this, because you can easily cause a deadlock where your +process is blocked waiting for output from the child, while the child +is blocked waiting for input from you. This can be caused +because the parent expects the child to output more text than it does, +or it can be caused by data being stuck in stdio buffers due to lack +of flushing. The Python parent can of course explicitly flush the data +it sends to the child before it reads any output, but if the child is +a naive C program it can easily have been written to never explicitly +flush its output, even if it is interactive, since flushing is +normally automatic. +

+Note that a deadlock is also possible if you use popen3 to read +stdout and stderr. If one of the two is too large for the internal +buffer (increasing the buffersize does not help) and you read() +the other one first, there is a deadlock, too. +

+Note on a bug in popen2: unless your program calls wait() +or waitpid(), finished child processes are never removed, +and eventually calls to popen2 will fail because of a limit on +the number of child processes. Calling os.waitpid with the +os.WNOHANG option can prevent this; a good place to insert such +a call would be before calling popen2 again. +

+Another way to produce a deadlock: Call a wait() and there is +still more output from the program than what fits into the +internal buffers. +

+In many cases, all you really need is to run some data through a +command and get the result back. Unless the data is infinite in size, +the easiest (and often the most efficient!) way to do this is to write +it to a temporary file and run the command with that temporary file as +input. The standard module tempfile exports a function mktemp() which +generates unique temporary file names. +

+

+ import tempfile
+ import os
+ class Popen3:
+    """
+    This is a deadlock-save version of popen, that returns
+    an object with errorlevel, out (a string) and err (a string).
+    (capturestderr may not work under windows.)
+    Example: print Popen3('grep spam','\n\nhere spam\n\n').out
+    """
+    def __init__(self,command,input=None,capturestderr=None):
+        outfile=tempfile.mktemp()
+        command="( %s ) > %s" % (command,outfile)
+        if input:
+            infile=tempfile.mktemp()
+            open(infile,"w").write(input)
+            command=command+" <"+infile
+        if capturestderr:
+            errfile=tempfile.mktemp()
+            command=command+" 2>"+errfile
+        self.errorlevel=os.system(command) >> 8
+        self.out=open(outfile,"r").read()
+        os.remove(outfile)
+        if input:
+            os.remove(infile)
+        if capturestderr:
+            self.err=open(errfile,"r").read()
+            os.remove(errfile)
+

+Note that many interactive programs (e.g. vi) don't work well with +pipes substituted for standard input and output. You will have to use +pseudo ttys ("ptys") instead of pipes. There is some undocumented +code to use these in the library module pty.py -- I'm afraid you're on +your own here. +

+A different answer is a Python interface to Don Libes' "expect" +library. A Python extension that interfaces to expect is called "expy" +and available from +http://expectpy.sourceforge.net/. +

+A pure Python solution that works like expect is pexpect of Noah Spurrier. +A beta version is available from +http://pexpect.sourceforge.net/ +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 3 16:31:31 2002 by +Tobias Polzin +

+ +

+

4.31. How do I call a function if I have the arguments in a tuple?

+Use the built-in function apply(). For instance, +

+

+    func(1, 2, 3)
+

+is equivalent to +

+

+    args = (1, 2, 3)
+    apply(func, args)
+

+Note that func(args) is not the same -- it calls func() with exactly +one argument, the tuple args, instead of three arguments, the integers +1, 2 and 3. +

+In Python 2.0, you can also use extended call syntax: +

+f(*args) is equivalent to apply(f, args) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:42:50 2001 by +Moshe Zadka +

+ +

+

4.32. How do I enable font-lock-mode for Python in Emacs?

+If you are using XEmacs 19.14 or later, any XEmacs 20, FSF Emacs 19.34 +or any Emacs 20, font-lock should work automatically for you if you +are using the latest python-mode.el. +

+If you are using an older version of XEmacs or Emacs you will need +to put this in your .emacs file: +

+

+        (defun my-python-mode-hook ()
+          (setq font-lock-keywords python-font-lock-keywords)
+          (font-lock-mode 1))
+        (add-hook 'python-mode-hook 'my-python-mode-hook)
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 6 16:18:46 1998 by +Barry Warsaw +

+ +

+

4.33. Is there a scanf() or sscanf() equivalent?

+Not as such. +

+For simple input parsing, the easiest approach is usually to split +the line into whitespace-delimited words using string.split(), and to +convert decimal strings to numeric values using int(), +long() or float(). (Python's int() is 32-bit and its +long() is arbitrary precision.) string.split supports an optional +"sep" parameter which is useful if the line uses something other +than whitespace as a delimiter. +

+For more complicated input parsing, regular expressions (see module re) +are better suited and more powerful than C's sscanf(). +

+There's a contributed module that emulates sscanf(), by Steve Clift; +see contrib/Misc/sscanfmodule.c of the ftp site: +

+

+    http://www.python.org/ftp/python/contrib-09-Dec-1999/Misc/
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:07:51 2002 by +Neal Norwitz +

+ +

+

4.34. Can I have Tk events handled while waiting for I/O?

+Yes, and you don't even need threads! But you'll have to +restructure your I/O code a bit. Tk has the equivalent of Xt's +XtAddInput() call, which allows you to register a callback function +which will be called from the Tk mainloop when I/O is possible on a +file descriptor. Here's what you need: +

+

+        from Tkinter import tkinter
+        tkinter.createfilehandler(file, mask, callback)
+

+The file may be a Python file or socket object (actually, anything +with a fileno() method), or an integer file descriptor. The mask is +one of the constants tkinter.READABLE or tkinter.WRITABLE. The +callback is called as follows: +

+

+        callback(file, mask)
+

+You must unregister the callback when you're done, using +

+

+        tkinter.deletefilehandler(file)
+

+Note: since you don't know *how many bytes* are available for reading, +you can't use the Python file object's read or readline methods, since +these will insist on reading a predefined number of bytes. For +sockets, the recv() or recvfrom() methods will work fine; for other +files, use os.read(file.fileno(), maxbytecount). +

+ +Edit this entry / +Log info +

+ +

+

4.35. How do I write a function with output parameters (call by reference)?

+[Mark Lutz] The thing to remember is that arguments are passed by +assignment in Python. Since assignment just creates references to +objects, there's no alias between an argument name in the caller and +callee, and so no call-by-reference per se. But you can simulate it +in a number of ways: +

+1) By using global variables; but you probably shouldn't :-) +

+2) By passing a mutable (changeable in-place) object: +

+

+      def func1(a):
+          a[0] = 'new-value'     # 'a' references a mutable list
+          a[1] = a[1] + 1        # changes a shared object
+

+

+      args = ['old-value', 99]
+      func1(args)
+      print args[0], args[1]     # output: new-value 100
+

+3) By returning a tuple, holding the final values of arguments: +

+

+      def func2(a, b):
+          a = 'new-value'        # a and b are local names
+          b = b + 1              # assigned to new objects
+          return a, b            # return new values
+

+

+      x, y = 'old-value', 99
+      x, y = func2(x, y)
+      print x, y                 # output: new-value 100
+

+4) And other ideas that fall-out from Python's object model. For instance, it might be clearer to pass in a mutable dictionary: +

+

+      def func3(args):
+          args['a'] = 'new-value'     # args is a mutable dictionary
+          args['b'] = args['b'] + 1   # change it in-place
+

+

+      args = {'a':' old-value', 'b': 99}
+      func3(args)
+      print args['a'], args['b']
+

+5) Or bundle-up values in a class instance: +

+

+      class callByRef:
+          def __init__(self, **args):
+              for (key, value) in args.items():
+                  setattr(self, key, value)
+

+

+      def func4(args):
+          args.a = 'new-value'        # args is a mutable callByRef
+          args.b = args.b + 1         # change object in-place
+

+

+      args = callByRef(a='old-value', b=99)
+      func4(args)
+      print args.a, args.b
+

+

+   But there's probably no good reason to get this complicated :-).
+

+[Python's author favors solution 3 in most cases.] +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 23:49:46 1997 by +David Ascher +

+ +

+

4.36. Please explain the rules for local and global variables in Python.

+[Ken Manheimer] In Python, procedure variables are implicitly +global, unless they are assigned anywhere within the block. +In that case +they are implicitly local, and you need to explicitly declare them as +'global'. +

+Though a bit surprising at first, a moment's consideration explains +this. On one hand, requirement of 'global' for assigned vars provides +a bar against unintended side-effects. On the other hand, if global +were required for all global references, you'd be using global all the +time. Eg, you'd have to declare as global every reference to a +builtin function, or to a component of an imported module. This +clutter would defeat the usefulness of the 'global' declaration for +identifying side-effects. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:53:27 1998 by +GvR +

+ +

+

4.37. How can I have modules that mutually import each other?

+Suppose you have the following modules: +

+foo.py: +

+

+	from bar import bar_var
+	foo_var=1
+

+bar.py: +

+

+	from foo import foo_var
+	bar_var=2
+

+The problem is that the above is processed by the interpreter thus: +

+

+	main imports foo
+	Empty globals for foo are created
+	foo is compiled and starts executing
+	foo imports bar
+	Empty globals for bar are created
+	bar is compiled and starts executing
+	bar imports foo (which is a no-op since there already is a module named foo)
+	bar.foo_var = foo.foo_var
+	...
+

+The last step fails, because Python isn't done with interpreting foo yet and the global symbol dict for foo is still empty. +

+The same thing happens when you use "import foo", and then try to access "foo.one" in global code. +

+

+There are (at least) three possible workarounds for this problem. +

+Guido van Rossum recommends to avoid all uses of "from <module> import ..." (so everything from an imported module is referenced as <module>.<name>) and to place all code inside functions. Initializations of global variables and class variables should use constants or built-in functions only. +

+

+Jim Roskind suggests the following order in each module: +

+

+ exports (globals, functions, and classes that don't need imported base classes)
+ import statements
+ active code (including globals that are initialized from imported values).
+

+Python's author doesn't like this approach much because the imports +appear in a strange place, but has to admit that it works. +

+

+

+Matthias Urlichs recommends to restructure your code so that the recursive import is not necessary in the first place. +

+

+These solutions are not mutually exclusive. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 06:52:51 2002 by +Matthias Urlichs +

+ +

+

4.38. How do I copy an object in Python?

+Try copy.copy() or copy.deepcopy() for the general case. Not all objects can be copied, but most can. +

+Dictionaries have a copy method. Sequences can be copied by slicing: +

+ new_l = l[:]
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:40:26 2002 by +Erno Kuusela +

+ +

+

4.39. How to implement persistent objects in Python? (Persistent == automatically saved to and restored from disk.)

+The library module "pickle" now solves this in a very general way +(though you still can't store things like open files, sockets or +windows), and the library module "shelve" uses pickle and (g)dbm to +create persistent mappings containing arbitrary Python objects. +For possibly better performance also look for the latest version +of the relatively recent cPickle module. +

+A more awkward way of doing things is to use pickle's little sister, +marshal. The marshal module provides very fast ways to store +noncircular basic Python types to files and strings, and back again. +Although marshal does not do fancy things like store instances or +handle shared references properly, it does run extremely fast. For +example loading a half megabyte of data may take less than a +third of a second (on some machines). This often beats doing +something more complex and general such as using gdbm with +pickle/shelve. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 8 22:59:00 1997 by +David Ascher +

+ +

+

4.40. I try to use __spam and I get an error about _SomeClassName__spam.

+Variables with double leading underscore are "mangled" to provide a +simple but effective way to define class private variables. See the +chapter "New in Release 1.4" in the Python Tutorial. +

+ +Edit this entry / +Log info +

+ +

+

4.41. How do I delete a file? And other file questions.

+Use os.remove(filename) or os.unlink(filename); for documentation, +see the posix section of the library manual. They are the same, +unlink() is simply the Unix name for this function. In earlier +versions of Python, only os.unlink() was available. +

+To remove a directory, use os.rmdir(); use os.mkdir() to create one. +

+To rename a file, use os.rename(). +

+To truncate a file, open it using f = open(filename, "r+"), and use +f.truncate(offset); offset defaults to the current seek position. +(The "r+" mode opens the file for reading and writing.) +There's also os.ftruncate(fd, offset) for files opened with os.open() +-- for advanced Unix hacks only. +

+The shutil module also contains a number of functions to work on files +including copyfile, copytree, and rmtree amongst others. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:30:01 2000 by +Bjorn Pettersen +

+ +

+

4.42. How to modify urllib or httplib to support HTTP/1.1?

+Recent versions of Python (2.0 and onwards) support HTTP/1.1 natively. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:56:56 2001 by +Moshe Zadka +

+ +

+

4.43. Unexplicable syntax errors in compile() or exec.

+When a statement suite (as opposed to an expression) is compiled by +compile(), exec or execfile(), it must end in a newline. In some +cases, when the source ends in an indented block it appears that at +least two newlines are required. +

+ +Edit this entry / +Log info +

+ +

+

4.44. How do I convert a string to a number?

+For integers, use the built-in int() function, e.g. int('144') == 144. Similarly, long() converts from string to long integer, e.g. long('144') == 144L; and float() to floating-point, e.g. float('144') == 144.0. +

+Note that these are restricted to decimal interpretation, so +that int('0144') == 144 and int('0x144') raises ValueError. For Python +2.0 int takes the base to convert from as a second optional argument, so +int('0x144', 16) == 324. +

+For greater flexibility, or before Python 1.5, import the module +string and use the string.atoi() function for integers, +string.atol() for long integers, or string.atof() for +floating-point. E.g., +string.atoi('100', 16) == string.atoi('0x100', 0) == 256. +See the library reference manual section for the string module for +more details. +

+While you could use the built-in function eval() instead of +any of those, this is not recommended, because someone could pass you +a Python expression that might have unwanted side effects (like +reformatting your disk). It also has the effect of interpreting numbers +as Python expressions, so that e.g. eval('09') gives a syntax error +since Python regards numbers starting with '0' as octal (base 8). +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:37:34 2000 by +Bjorn Pettersen +

+ +

+

4.45. How do I convert a number to a string?

+To convert, e.g., the number 144 to the string '144', use the +built-in function repr() or the backquote notation (these are +equivalent). If you want a hexadecimal or octal representation, use +the built-in functions hex() or oct(), respectively. For fancy +formatting, use the % operator on strings, just like C printf formats, +e.g. "%04d" % 144 yields '0144' and "%.3f" % (1/3.0) yields '0.333'. +See the library reference manual for details. +

+ +Edit this entry / +Log info +

+ +

+

4.46. How do I copy a file?

+There's the shutil module which contains a copyfile() +function that implements a copy loop; +it isn't good enough for the Macintosh, though: +it doesn't copy the resource fork and Finder info. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 02:59:40 2001 by +Moshe Zadka +

+ +

+

4.47. How do I check if an object is an instance of a given class or of a subclass of it?

+If you are developing the classes from scratch it might be better to +program in a more proper object-oriented style -- instead of doing a different +thing based on class membership, why not use a method and define the +method differently in different classes? +

+However, there are some legitimate situations +where you need to test for class membership. +

+In Python 1.5, you can use the built-in function isinstance(obj, cls). +

+The following approaches can be used with earlier Python versions: +

+An unobvious method is to raise the object +as an exception and to try to catch the exception with the class you're +testing for: +

+

+	def is_instance_of(the_instance, the_class):
+	    try:
+		raise the_instance
+	    except the_class:
+		return 1
+	    except:
+		return 0
+

+This technique can be used to distinguish "subclassness" +from a collection of classes as well +

+

+                try:
+                              raise the_instance
+                except Audible:
+                              the_instance.play(largo)
+                except Visual:
+                              the_instance.display(gaudy)
+                except Olfactory:
+                              sniff(the_instance)
+                except:
+                              raise ValueError, "dunno what to do with this!"
+

+This uses the fact that exception catching tests for class or subclass +membership. +

+A different approach is to test for the presence of a class attribute that +is presumably unique for the given class. For instance: +

+

+	class MyClass:
+	    ThisIsMyClass = 1
+	    ...
+

+

+	def is_a_MyClass(the_instance):
+	    return hasattr(the_instance, 'ThisIsMyClass')
+

+This version is easier to inline, and probably faster (inlined it +is definitely faster). The disadvantage is that someone else could cheat: +

+

+	class IntruderClass:
+	    ThisIsMyClass = 1    # Masquerade as MyClass
+	    ...
+

+but this may be seen as a feature (anyway, there are plenty of other ways +to cheat in Python). Another disadvantage is that the class must be +prepared for the membership test. If you do not "control the +source code" for the class it may not be advisable to modify the +class to support testability. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 2 15:16:04 1998 by +GvR +

+ +

+

4.48. What is delegation?

+Delegation refers to an object oriented technique Python programmers +may implement with particular ease. Consider the following: +

+

+  from string import upper
+

+

+  class UpperOut:
+        def __init__(self, outfile):
+              self.__outfile = outfile
+        def write(self, str):
+              self.__outfile.write( upper(str) )
+        def __getattr__(self, name):
+              return getattr(self.__outfile, name)
+

+Here the UpperOut class redefines the write method +to convert the argument string to upper case before +calling the underlying self.__outfile.write method, but +all other methods are delegated to the underlying +self.__outfile object. The delegation is accomplished +via the "magic" __getattr__ method. Please see the +language reference for more information on the use +of this method. +

+Note that for more general cases delegation can +get trickier. Particularly when attributes must be set +as well as gotten the class must define a __settattr__ +method too, and it must do so carefully. +

+The basic implementation of __setattr__ is roughly +equivalent to the following: +

+

+   class X:
+        ...
+        def __setattr__(self, name, value):
+             self.__dict__[name] = value
+        ...
+

+Most __setattr__ implementations must modify +self.__dict__ to store local state for self without +causing an infinite recursion. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:11:24 1997 by +aaron watters +

+ +

+

4.49. How do I test a Python program or component.

+We presume for the purposes of this question you are interested +in standalone testing, rather than testing your components inside +a testing framework. The best-known testing framework for Python +is the PyUnit module, maintained at +

+

+    http://pyunit.sourceforge.net/
+

+For standalone testing, it helps to write the program so that +it may be easily tested by using good modular design. +In particular your program +should have almost all functionality encapsulated in either functions +or class methods -- and this sometimes has the surprising and +delightful effect of making the program run faster (because +local variable accesses are faster than global accesses). +Furthermore the program should avoid depending on mutating +global variables, since this makes testing much more difficult to do. +

+The "global main logic" of your program may be as simple +as +

+

+  if __name__=="__main__":
+       main_logic()
+

+at the bottom of the main module of your program. +

+Once your program is organized as a tractable collection +of functions and class behaviours you should write test +functions that exercise the behaviours. A test suite +can be associated with each module which automates +a sequence of tests. This sounds like a lot of work, but +since Python is so terse and flexible it's surprisingly easy. +You can make coding much more pleasant and fun by +writing your test functions in parallel with the "production +code", since this makes it easy to find bugs and even +design flaws earlier. +

+"Support modules" that are not intended to be the main +module of a program may include a "test script interpretation" +which invokes a self test of the module. +

+

+   if __name__ == "__main__":
+      self_test()
+

+Even programs that interact with complex external +interfaces may be tested when the external interfaces are +unavailable by using "fake" interfaces implemented in +Python. For an example of a "fake" interface, the following +class defines (part of) a "fake" file interface: +

+

+ import string
+ testdata = "just a random sequence of characters"
+

+

+ class FakeInputFile:
+   data = testdata
+   position = 0
+   closed = 0
+

+

+   def read(self, n=None):
+       self.testclosed()
+       p = self.position
+       if n is None:
+          result= self.data[p:]
+       else:
+          result= self.data[p: p+n]
+       self.position = p + len(result)
+       return result
+

+

+   def seek(self, n, m=0):
+       self.testclosed()
+       last = len(self.data)
+       p = self.position
+       if m==0: 
+          final=n
+       elif m==1:
+          final=n+p
+       elif m==2:
+          final=len(self.data)+n
+       else:
+          raise ValueError, "bad m"
+       if final<0:
+          raise IOError, "negative seek"
+       self.position = final
+

+

+   def isatty(self):
+       return 0
+

+

+   def tell(self):
+       return self.position
+

+

+   def close(self):
+       self.closed = 1
+

+

+   def testclosed(self):
+       if self.closed:
+          raise IOError, "file closed"
+

+Try f=FakeInputFile() and test out its operations. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:12:10 2002 by +Neal Norwitz +

+ +

+

4.50. My multidimensional list (array) is broken! What gives?

+You probably tried to make a multidimensional array like this. +

+

+   A = [[None] * 2] * 3
+

+This makes a list containing 3 references to the same list of length +two. Changes to one row will show in all rows, which is probably not +what you want. The following works much better: +

+

+   A = [None]*3
+   for i in range(3):
+        A[i] = [None] * 2
+

+This generates a list containing 3 different lists of length two. +

+If you feel weird, you can also do it in the following way: +

+

+   w, h = 2, 3
+   A = map(lambda i,w=w: [None] * w, range(h))
+

+For Python 2.0 the above can be spelled using a list comprehension: +

+

+   w,h = 2,3
+   A = [ [None]*w for i in range(h) ]
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:18:35 2000 by +Bjorn Pettersen +

+ +

+

4.51. I want to do a complicated sort: can you do a Schwartzian Transform in Python?

+Yes, and in Python you only have to write it once: +

+

+ def st(List, Metric):
+     def pairing(element, M = Metric):
+           return (M(element), element)
+     paired = map(pairing, List)
+     paired.sort()
+     return map(stripit, paired)
+

+

+ def stripit(pair):
+     return pair[1]
+

+This technique, attributed to Randal Schwartz, sorts the elements +of a list by a metric which maps each element to its "sort value". +For example, if L is a list of string then +

+

+   import string
+   Usorted = st(L, string.upper)
+

+

+   def intfield(s):
+         return string.atoi( string.strip(s[10:15] ) )
+

+

+   Isorted = st(L, intfield)
+

+Usorted gives the elements of L sorted as if they were upper +case, and Isorted gives the elements of L sorted by the integer +values that appear in the string slices starting at position 10 +and ending at position 15. In Python 2.0 this can be done more +naturally with list comprehensions: +

+

+  tmp1 = [ (x.upper(), x) for x in L ] # Schwartzian transform
+  tmp1.sort()
+  Usorted = [ x[1] for x in tmp1 ]
+

+

+  tmp2 = [ (int(s[10:15]), s) for s in L ] # Schwartzian transform
+  tmp2.sort()
+  Isorted = [ x[1] for x in tmp2 ]
+

+

+Note that Isorted may also be computed by +

+

+   def Icmp(s1, s2):
+         return cmp( intfield(s1), intfield(s2) )
+

+

+   Isorted = L[:]
+   Isorted.sort(Icmp)
+

+but since this method computes intfield many times for each +element of L, it is slower than the Schwartzian Transform. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Jun 1 19:18:46 2002 by +Neal Norwitz +

+ +

+

4.52. How to convert between tuples and lists?

+The function tuple(seq) converts any sequence into a tuple with +the same items in the same order. +For example, tuple([1, 2, 3]) yields (1, 2, 3) and tuple('abc') +yields ('a', 'b', 'c'). If the argument is +a tuple, it does not make a copy but returns the same object, so +it is cheap to call tuple() when you aren't sure that an object +is already a tuple. +

+The function list(seq) converts any sequence into a list with +the same items in the same order. +For example, list((1, 2, 3)) yields [1, 2, 3] and list('abc') +yields ['a', 'b', 'c']. If the argument is a list, +it makes a copy just like seq[:] would. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:18:53 1998 by +Tim Peters +

+ +

+

4.53. Files retrieved with urllib contain leading garbage that looks like email headers.

+Extremely old versions of Python supplied libraries which +did not support HTTP/1.1; the vanilla httplib in Python 1.4 +only recognized HTTP/1.0. In Python 2.0 full HTTP/1.1 support is included. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 8 17:26:18 2001 by +Steve Holden +

+ +

+

4.54. How do I get a list of all instances of a given class?

+Python does not keep track of all instances of a class (or of a +built-in type). +

+You can program the class's constructor to keep track of all +instances, but unless you're very clever, this has the disadvantage +that the instances never get deleted,because your list of all +instances keeps a reference to them. +

+(The trick is to regularly inspect the reference counts of the +instances you've retained, and if the reference count is below a +certain level, remove it from the list. Determining that level is +tricky -- it's definitely larger than 1.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 27 23:52:16 1997 by +GvR +

+ +

+

4.55. A regular expression fails with regex.error: match failure.

+This is usually caused by too much backtracking; the regular +expression engine has a fixed size stack which holds at most 4000 +backtrack points. Every character matched by e.g. ".*" accounts for a +backtrack point, so even a simple search like +

+

+  regex.match('.*x',"x"*5000)
+

+will fail. +

+This is fixed in the re module introduced with +Python 1.5; consult the Library Reference section on re for more information. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 30 12:35:49 1998 by +A.M. Kuchling +

+ +

+

4.56. I can't get signal handlers to work.

+The most common problem is that the signal handler is declared +with the wrong argument list. It is called as +

+

+	handler(signum, frame)
+

+so it should be declared with two arguments: +

+

+	def handler(signum, frame):
+		...
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed May 28 09:29:08 1997 by +GvR +

+ +

+

4.57. I can't use a global variable in a function? Help!

+Did you do something like this? +

+

+   x = 1 # make a global
+

+

+   def f():
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+

+Any variable assigned in a function is local to that function. +unless it is specifically declared global. Since a value is bound +to x as the last statement of the function body, the compiler +assumes that x is local. Consequently the "print x" +attempts to print an uninitialized local variable and will +trigger a NameError. +

+In such cases the solution is to insert an explicit global +declaration at the start of the function, making it +

+

+

+   def f():
+         global x
+         print x # try to print the global
+         ...
+         for j in range(100):
+              if q>3:
+                 x=4
+

+

+In this case, all references to x are interpreted as references +to the x from the module namespace. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:52:12 2001 by +Steve Holden +

+ +

+

4.58. What's a negative index? Why doesn't list.insert() use them?

+Python sequences are indexed with positive numbers and +negative numbers. For positive numbers 0 is the first index +1 is the second index and so forth. For negative indices -1 +is the last index and -2 is the pentultimate (next to last) index +and so forth. Think of seq[-n] as the same as seq[len(seq)-n]. +

+Using negative indices can be very convenient. For example +if the string Line ends in a newline then Line[:-1] is all of Line except +the newline. +

+Sadly the list builtin method L.insert does not observe negative +indices. This feature could be considered a mistake but since +existing programs depend on this feature it may stay around +forever. L.insert for negative indices inserts at the start of the +list. To get "proper" negative index behaviour use L[n:n] = [x] +in place of the insert method. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:03:18 1997 by +aaron watters +

+ +

+

4.59. How can I sort one list by values from another list?

+You can sort lists of tuples. +

+

+  >>> list1 = ["what", "I'm", "sorting", "by"]
+  >>> list2 = ["something", "else", "to", "sort"]
+  >>> pairs = map(None, list1, list2)
+  >>> pairs
+  [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+  >>> pairs.sort()
+  >>> pairs
+  [("I'm", 'else'), ('by', 'sort'), ('sorting', 'to'), ('what', 'something')]
+  >>> result = pairs[:]
+  >>> for i in xrange(len(result)): result[i] = result[i][1]
+  ...
+  >>> result
+  ['else', 'sort', 'to', 'something']
+

+And if you didn't understand the question, please see the +example above ;c). Note that "I'm" sorts before "by" because +uppercase "I" comes before lowercase "b" in the ascii order. +Also see 4.51. +

+In Python 2.0 this can be done like: +

+

+ >>> list1 = ["what", "I'm", "sorting", "by"]
+ >>> list2 = ["something", "else", "to", "sort"]
+ >>> pairs = zip(list1, list2)
+ >>> pairs
+ [('what', 'something'), ("I'm", 'else'), ('sorting', 'to'), ('by', 'sort')]
+ >>> pairs.sort()
+ >>> result = [ x[1] for x in pairs ]
+ >>> result
+ ['else', 'sort', 'to', 'something']
+

+[Followup] +

+Someone asked, why not this for the last steps: +

+

+  result = []
+  for p in pairs: result.append(p[1])
+

+This is much more legible. However, a quick test shows that +it is almost twice as slow for long lists. Why? First of all, +the append() operation has to reallocate memory, and while it +uses some tricks to avoid doing that each time, it still has +to do it occasionally, and apparently that costs quite a bit. +Second, the expression "result.append" requires an extra +attribute lookup. The attribute lookup could be done away +with by rewriting as follows: +

+

+  result = []
+  append = result.append
+  for p in pairs: append(p[1])
+

+which gains back some speed, but is still considerably slower +than the original solution, and hardly less convoluted. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 12:56:35 2000 by +Bjorn Pettersen +

+ +

+

4.60. Why doesn't dir() work on builtin types like files and lists?

+It does starting with Python 1.5. +

+Using 1.4, you can find out which methods a given object supports +by looking at its __methods__ attribute: +

+

+    >>> List = []
+    >>> List.__methods__
+    ['append', 'count', 'index', 'insert', 'remove', 'reverse', 'sort']
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 14:56:42 1999 by +Skip Montanaro +

+ +

+

4.61. How can I mimic CGI form submission (METHOD=POST)?

+I would like to retrieve web pages that are the result of POSTing a +form. Is there existing code that would let me do this easily? +

+Yes. Here's a simple example that uses httplib. +

+

+    #!/usr/local/bin/python
+

+

+    import httplib, sys, time
+

+

+    ### build the query string
+    qs = "First=Josephine&MI=Q&Last=Public"
+

+

+    ### connect and send the server a path
+    httpobj = httplib.HTTP('www.some-server.out-there', 80)
+    httpobj.putrequest('POST', '/cgi-bin/some-cgi-script')
+    ### now generate the rest of the HTTP headers...
+    httpobj.putheader('Accept', '*/*')
+    httpobj.putheader('Connection', 'Keep-Alive')
+    httpobj.putheader('Content-type', 'application/x-www-form-urlencoded')
+    httpobj.putheader('Content-length', '%d' % len(qs))
+    httpobj.endheaders()
+    httpobj.send(qs)
+    ### find out what the server said in response...
+    reply, msg, hdrs = httpobj.getreply()
+    if reply != 200:
+	sys.stdout.write(httpobj.getfile().read())
+

+Note that in general for "url encoded posts" (the default) query strings must be "quoted" to, for example, change equals signs and spaces to an encoded form when they occur in name or value. Use urllib.quote to perform this quoting. For example to send name="Guy Steele, Jr.": +

+

+   >>> from urllib import quote
+   >>> x = quote("Guy Steele, Jr.")
+   >>> x
+   'Guy%20Steele,%20Jr.'
+   >>> query_string = "name="+x
+   >>> query_string
+   'name=Guy%20Steele,%20Jr.'
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 21 03:47:07 1999 by +TAB +

+ +

+

4.62. If my program crashes with a bsddb (or anydbm) database open, it gets corrupted. How come?

+Databases opened for write access with the bsddb module (and often by +the anydbm module, since it will preferentially use bsddb) must +explicitly be closed using the close method of the database. The +underlying libdb package caches database contents which need to be +converted to on-disk form and written, unlike regular open files which +already have the on-disk bits in the kernel's write buffer, where they +can just be dumped by the kernel with the program exits. +

+If you have initialized a new bsddb database but not written anything to +it before the program crashes, you will often wind up with a zero-length +file and encounter an exception the next time the file is opened. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:15:01 2002 by +Neal Norwitz +

+ +

+

4.63. How do I make a Python script executable on Unix?

+You need to do two things: the script file's mode must be executable +(include the 'x' bit), and the first line must begin with #! +followed by the pathname for the Python interpreter. +

+The first is done by executing 'chmod +x scriptfile' or perhaps +'chmod 755 scriptfile'. +

+The second can be done in a number of way. The most straightforward +way is to write +

+

+  #!/usr/local/bin/python
+

+as the very first line of your file - or whatever the pathname is +where the python interpreter is installed on your platform. +

+If you would like the script to be independent of where the python +interpreter lives, you can use the "env" program. On almost all +platforms, the following will work, assuming the python interpreter +is in a directory on the user's $PATH: +

+

+  #! /usr/bin/env python
+

+Note -- *don't* do this for CGI scripts. The $PATH variable for +CGI scripts is often very minimal, so you need to use the actual +absolute pathname of the interpreter. +

+Occasionally, a user's environment is so full that the /usr/bin/env +program fails; or there's no env program at all. +In that case, you can try the following hack (due to Alex Rezinsky): +

+

+  #! /bin/sh
+  """:"
+  exec python $0 ${1+"$@"}
+  """
+

+The disadvantage is that this defines the script's __doc__ string. +However, you can fix that by adding +

+

+  __doc__ = """...Whatever..."""
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 15 09:19:16 2001 by +Neal Norwitz +

+ +

+

4.64. How do you remove duplicates from a list?

+See the Python Cookbook for a long discussion of many cool ways: +

+

+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560
+

+Generally, if you don't mind reordering the List +

+

+   if List:
+      List.sort()
+      last = List[-1]
+      for i in range(len(List)-2, -1, -1):
+          if last==List[i]: del List[i]
+          else: last=List[i]
+

+If all elements of the list may be used as +dictionary keys (ie, they are all hashable) +this is often faster +

+

+   d = {}
+   for x in List: d[x]=x
+   List = d.values()
+

+Also, for extremely large lists you might +consider more optimal alternatives to the first one. +The second one is pretty good whenever it can +be used. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:56:33 2002 by +Tim Peters +

+ +

+

4.65. Are there any known year 2000 problems in Python?

+I am not aware of year 2000 deficiencies in Python 1.5. Python does +very few date calculations and for what it does, it relies on the C +library functions. Python generally represent times either as seconds +since 1970 or as a tuple (year, month, day, ...) where the year is +expressed with four digits, which makes Y2K bugs unlikely. So as long +as your C library is okay, Python should be okay. Of course, I cannot +vouch for your Python code! +

+Given the nature of freely available software, I have to add that this statement is not +legally binding. The Python copyright notice contains the following +disclaimer: +

+

+  STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
+  CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+  DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+

+The good news is that if you encounter a problem, you have full +source available to track it down and fix it! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Apr 10 14:59:31 1998 by +GvR +

+ +

+

4.66. I want a version of map that applies a method to a sequence of objects! Help!

+Get fancy! +

+

+  def method_map(objects, method, arguments):
+       """method_map([a,b], "flog", (1,2)) gives [a.flog(1,2), b.flog(1,2)]"""
+       nobjects = len(objects)
+       methods = map(getattr, objects, [method]*nobjects)
+       return map(apply, methods, [arguments]*nobjects)
+

+It's generally a good idea to get to know the mysteries of map and apply +and getattr and the other dynamic features of Python. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jan 5 14:21:14 1998 by +Aaron Watters +

+ +

+

4.67. How do I generate random numbers in Python?

+The standard library module "random" implements a random number +generator. Usage is simple: +

+

+    import random
+

+

+    random.random()
+

+This returns a random floating point number in the range [0, 1). +

+There are also many other specialized generators in this module, such +as +

+

+    randrange(a, b) chooses an integer in the range [a, b)
+    uniform(a, b) chooses a floating point number in the range [a, b)
+    normalvariate(mean, sdev) sample from normal (Gaussian) distribution
+

+Some higher-level functions operate on sequences directly, such as +

+

+    choice(S) chooses random element from a given sequence
+    shuffle(L) shuffles a list in-place, i.e. permutes it randomly
+

+There's also a class, Random, which you can instantiate +to create independent multiple random number generators. +

+All this is documented in the library reference manual. Note that +the module "whrandom" is obsolete. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 01:16:51 2002 by +Neal Norwitz +

+ +

+

4.68. How do I access the serial (RS232) port?

+There's a Windows serial communication module (for communication +over RS 232 serial ports) at +

+

+  ftp://ftp.python.org/pub/python/contrib/sio-151.zip
+  http://www.python.org/ftp/python/contrib/sio-151.zip
+

+For DOS, try Hans Nowak's Python-DX, which supports this, at: +

+

+  http://www.cuci.nl/~hnowak/
+

+For Unix, see a usenet post by Mitch Chapman: +

+

+  http://groups.google.com/groups?selm=34A04430.CF9@ohioee.com
+

+For Win32, POSIX(Linux, BSD, *), Jython, Chris': +

+

+  http://pyserial.sourceforge.net
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 2 21:11:07 2002 by +Chris Liechti +

+ +

+

4.69. Images on Tk-Buttons don't work in Py15?

+They do work, but you must keep your own reference to the image +object now. More verbosely, you must make sure that, say, a global +variable or a class attribute refers to the object. +

+Quoting Fredrik Lundh from the mailinglist: +

+

+  Well, the Tk button widget keeps a reference to the internal
+  photoimage object, but Tkinter does not.  So when the last
+  Python reference goes away, Tkinter tells Tk to release the
+  photoimage.  But since the image is in use by a widget, Tk
+  doesn't destroy it.  Not completely.  It just blanks the image,
+  making it completely transparent...
+

+

+  And yes, there was a bug in the keyword argument handling
+  in 1.4 that kept an extra reference around in some cases.  And
+  when Guido fixed that bug in 1.5, he broke quite a few Tkinter
+  programs...
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 11:31:03 1998 by +Case Roole +

+ +

+

4.70. Where is the math.py (socket.py, regex.py, etc.) source file?

+If you can't find a source file for a module it may be a builtin +or dynamically loaded module implemented in C, C++ or other +compiled language. In this case you may not have the source +file or it may be something like mathmodule.c, somewhere in +a C source directory (not on the Python Path). +

+Fredrik Lundh (fredrik@pythonware.com) explains (on the python-list): +

+There are (at least) three kinds of modules in Python: +1) modules written in Python (.py); +2) modules written in C and dynamically loaded (.dll, .pyd, .so, .sl, etc); +3) modules written in C and linked with the interpreter; to get a list +of these, type: +

+

+    import sys
+    print sys.builtin_module_names
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 3 13:55:33 1998 by +Aaron Watters +

+ +

+

4.71. How do I send mail from a Python script?

+The standard library module smtplib does this. +Here's a very simple interactive mail +sender that uses it. This method will work on any host that +supports an SMTP listener. +

+

+    import sys, smtplib
+

+

+    fromaddr = raw_input("From: ")
+    toaddrs  = raw_input("To: ").split(',')
+    print "Enter message, end with ^D:"
+    msg = ''
+    while 1:
+        line = sys.stdin.readline()
+        if not line:
+            break
+        msg = msg + line
+

+

+    # The actual mail send
+    server = smtplib.SMTP('localhost')
+    server.sendmail(fromaddr, toaddrs, msg)
+    server.quit()
+

+If the local host doesn't have an SMTP listener, you need to find one. The simple method is to ask the user. Alternately, you can use the DNS system to find the mail gateway(s) responsible for the source address. +

+A Unix-only alternative uses sendmail. The location of the +sendmail program varies between systems; sometimes it is +/usr/lib/sendmail, sometime /usr/sbin/sendmail. The sendmail manual +page will help you out. Here's some sample code: +

+

+  SENDMAIL = "/usr/sbin/sendmail" # sendmail location
+  import os
+  p = os.popen("%s -t -i" % SENDMAIL, "w")
+  p.write("To: cary@ratatosk.org\n")
+  p.write("Subject: test\n")
+  p.write("\n") # blank line separating headers from body
+  p.write("Some text\n")
+  p.write("some more text\n")
+  sts = p.close()
+  if sts != 0:
+      print "Sendmail exit status", sts
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:05:12 2002 by +Matthias Urlichs +

+ +

+

4.72. How do I avoid blocking in connect() of a socket?

+The select module is widely known to help with asynchronous +I/O on sockets once they are connected. However, it is less +than common knowledge how to avoid blocking on the initial +connect() call. Jeremy Hylton has the following advice (slightly +edited): +

+To prevent the TCP connect from blocking, you can set the socket to +non-blocking mode. Then when you do the connect(), you will either +connect immediately (unlikely) or get an exception that contains the +errno. errno.EINPROGRESS indicates that the connection is in +progress, but hasn't finished yet. Different OSes will return +different errnos, so you're going to have to check. I can tell you +that different versions of Solaris return different errno values. +

+In Python 1.5 and later, you can use connect_ex() to avoid +creating an exception. It will just return the errno value. +

+To poll, you can call connect_ex() again later -- 0 or errno.EISCONN +indicate that you're connected -- or you can pass this socket to +select (checking to see if it is writeable). +

+ +Edit this entry / +Log info + +/ Last changed on Tue Feb 24 21:30:45 1998 by +GvR +

+ +

+

4.73. How do I specify hexadecimal and octal integers?

+To specify an octal digit, precede the octal value with a zero. For example, +to set the variable "a" to the octal value "10" (8 in decimal), type: +

+

+    >>> a = 010
+

+To verify that this works, you can type "a" and hit enter while in the +interpreter, which will cause Python to spit out the current value of "a" +in decimal: +

+

+    >>> a
+    8
+

+Hexadecimal is just as easy. Simply precede the hexadecimal number with a +zero, and then a lower or uppercase "x". Hexadecimal digits can be specified +in lower or uppercase. For example, in the Python interpreter: +

+

+    >>> a = 0xa5
+    >>> a
+    165
+    >>> b = 0XB2
+    >>> b
+    178
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Mar 3 12:53:16 1998 by +GvR +

+ +

+

4.74. How to get a single keypress at a time?

+For Windows, see question 8.2. Here is an answer for Unix (see also 4.94). +

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses, due +to Andrew Kuchling (adapted from code to do a PGP-style +randomness pool): +

+

+        import termios, sys, os
+        fd = sys.stdin.fileno()
+        old = termios.tcgetattr(fd)
+        new = termios.tcgetattr(fd)
+        new[3] = new[3] & ~termios.ICANON & ~termios.ECHO
+        new[6][termios.VMIN] = 1
+        new[6][termios.VTIME] = 0
+        termios.tcsetattr(fd, termios.TCSANOW, new)
+        s = ''    # We'll save the characters typed and add them to the pool.
+        try:
+            while 1:
+                c = os.read(fd, 1)
+                print "Got character", `c`
+                s = s+c
+        finally:
+            termios.tcsetattr(fd, termios.TCSAFLUSH, old)
+

+You need the termios module for any of this to work, and I've only +tried it on Linux, though it should work elsewhere. It turns off +stdin's echoing and disables canonical mode, and then reads a +character at a time from stdin, noting the time after each keystroke. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:36:56 2002 by +chris +

+ +

+

4.75. How can I overload constructors (or methods) in Python?

+(This actually applies to all methods, but somehow the question +usually comes up first in the context of constructors.) +

+Where in C++ you'd write +

+

+    class C {
+        C() { cout << "No arguments\n"; }
+        C(int i) { cout << "Argument is " << i << "\n"; }
+    }
+

+in Python you have to write a single constructor that catches all +cases using default arguments. For example: +

+

+    class C:
+        def __init__(self, i=None):
+            if i is None:
+                print "No arguments"
+            else:
+                print "Argument is", i
+

+This is not entirely equivalent, but close enough in practice. +

+You could also try a variable-length argument list, e.g. +

+

+        def __init__(self, *args):
+            ....
+

+The same approach works for all method definitions. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 20 11:55:55 1998 by +GvR +

+ +

+

4.76. How do I pass keyword arguments from one method to another?

+Use apply. For example: +

+

+    class Account:
+        def __init__(self, **kw):
+            self.accountType = kw.get('accountType')
+            self.balance = kw.get('balance')
+

+

+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            apply(Account.__init__, (self,), kw)
+

+

+    myAccount = CheckingAccount(balance=100.00)
+

+In Python 2.0 you can call it directly using the new ** syntax: +

+

+    class CheckingAccount(Account):
+        def __init__(self, **kw):
+            kw['accountType'] = 'checking'
+            Account.__init__(self, **kw)
+

+or more generally: +

+

+ >>> def f(x, *y, **z):
+ ...  print x,y,z
+ ...
+ >>> Y = [1,2,3]
+ >>> Z = {'foo':3,'bar':None}
+ >>> f('hello', *Y, **Z)
+ hello (1, 2, 3) {'foo': 3, 'bar': None}
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 28 13:04:01 2000 by +Bjorn Pettersen +

+ +

+

4.77. What module should I use to help with generating HTML?

+Check out HTMLgen written by Robin Friedrich. It's a class library +of objects corresponding to all the HTML 3.2 markup tags. It's used +when you are writing in Python and wish to synthesize HTML pages for +generating a web or for CGI forms, etc. +

+It can be found in the FTP contrib area on python.org or on the +Starship. Use the search engines there to locate the latest version. +

+It might also be useful to consider DocumentTemplate, which offers clear +separation between Python code and HTML code. DocumentTemplate is part +of the Bobo objects publishing system (http:/www.digicool.com/releases) +but can be used independantly of course! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 28 09:54:58 1998 by +GvR +

+ +

+

4.78. How do I create documentation from doc strings?

+Use gendoc, by Daniel Larson. See +

+http://starship.python.net/crew/danilo/ +

+It can create HTML from the doc strings in your Python source code. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Oct 7 17:15:51 2002 by +Phil Rittenhouse +

+ +

+

4.79. How do I read (or write) binary data?

+For complex data formats, it's best to use +use the struct module. It's documented in the library reference. +It allows you to take a string read from a file containing binary +data (usually numbers) and convert it to Python objects; and vice +versa. +

+For example, the following code reads two 2-byte integers +and one 4-byte integer in big-endian format from a file: +

+

+  import struct
+

+

+  f = open(filename, "rb")  # Open in binary mode for portability
+  s = f.read(8)
+  x, y, z = struct.unpack(">hhl", s)
+

+The '>' in the format string forces bin-endian data; the letter +'h' reads one "short integer" (2 bytes), and 'l' reads one +"long integer" (4 bytes) from the string. +

+For data that is more regular (e.g. a homogeneous list of ints or +floats), you can also use the array module, also documented +in the library reference. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Oct 7 09:16:45 1998 by +GvR +

+ +

+

4.80. I can't get key bindings to work in Tkinter

+An oft-heard complaint is that event handlers bound to events +with the bind() method don't get handled even when the appropriate +key is pressed. +

+The most common cause is that the widget to which the binding applies +doesn't have "keyboard focus". Check out the Tk documentation +for the focus command. Usually a widget is given the keyboard +focus by clicking in it (but not for labels; see the taketocus +option). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:37:33 1998 by +GvR +

+ +

+

4.81. "import crypt" fails

+[Unix] +

+Starting with Python 1.5, the crypt module is disabled by default. +In order to enable it, you must go into the Python source tree and +edit the file Modules/Setup to enable it (remove a '#' sign in +front of the line starting with '#crypt'). Then rebuild. +You may also have to add the string '-lcrypt' to that same line. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 5 08:57:09 1998 by +GvR +

+ +

+

4.82. Are there coding standards or a style guide for Python programs?

+Yes, Guido has written the "Python Style Guide". See +http://www.python.org/doc/essays/styleguide.html +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:50:27 1998 by +Joseph VanAndel +

+ +

+

4.83. How do I freeze Tkinter applications?

+Freeze is a tool to create stand-alone applications (see 4.28). +

+When freezing Tkinter applications, the applications will not be +truly stand-alone, as the application will still need the tcl and +tk libraries. +

+One solution is to ship the application with the tcl and tk libraries, +and point to them at run-time using the TCL_LIBRARY and TK_LIBRARY +environment variables. +

+To get truly stand-alone applications, the Tcl scripts that form +the library have to be integrated into the application as well. One +tool supporting that is SAM (stand-alone modules), which is part +of the Tix distribution (http://tix.mne.com). Build Tix with SAM +enabled, perform the appropriate call to Tclsam_init etc inside +Python's Modules/tkappinit.c, and link with libtclsam +and libtksam (you might include the Tix libraries as well). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 20 17:35:01 1999 by +Martin v. L�wis +

+ +

+

4.84. How do I create static class data and static class methods?

+[Tim Peters, tim_one@email.msn.com] +

+Static data (in the sense of C++ or Java) is easy; static methods (again in the sense of C++ or Java) are not supported directly. +

+STATIC DATA +

+For example, +

+

+    class C:
+        count = 0   # number of times C.__init__ called
+

+

+        def __init__(self):
+            C.count = C.count + 1
+

+

+        def getcount(self):
+            return C.count  # or return self.count
+

+c.count also refers to C.count for any c such that isinstance(c, C) holds, unless overridden by c itself or by some class on the base-class search path from c.__class__ back to C. +

+Caution: within a method of C, +

+

+    self.count = 42
+

+creates a new and unrelated instance vrbl named "count" in self's own dict. So rebinding of a class-static data name needs the +

+

+    C.count = 314
+

+form whether inside a method or not. +

+

+STATIC METHODS +

+Static methods (as opposed to static data) are unnatural in Python, because +

+

+    C.getcount
+

+returns an unbound method object, which can't be invoked without supplying an instance of C as the first argument. +

+The intended way to get the effect of a static method is via a module-level function: +

+

+    def getcount():
+        return C.count
+

+If your code is structured so as to define one class (or tightly related class hierarchy) per module, this supplies the desired encapsulation. +

+Several tortured schemes for faking static methods can be found by searching DejaNews. Most people feel such cures are worse than the disease. Perhaps the least obnoxious is due to Pekka Pessi (mailto:ppessi@hut.fi): +

+

+    # helper class to disguise function objects
+    class _static:
+        def __init__(self, f):
+            self.__call__ = f
+

+

+    class C:
+        count = 0
+

+

+        def __init__(self):
+            C.count = C.count + 1
+

+

+        def getcount():
+            return C.count
+        getcount = _static(getcount)
+

+

+        def sum(x, y):
+            return x + y
+        sum = _static(sum)
+

+

+    C(); C()
+    c = C()
+    print C.getcount()  # prints 3
+    print c.getcount()  # prints 3
+    print C.sum(27, 15) # prints 42
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 21 21:35:38 1999 by +Tim Peters +

+ +

+

4.85. import('x.y.z') returns <module 'x'>; how do I get z?

+Try +

+

+   __import__('x.y.z').y.z
+

+For more realistic situations, you may have to do something like +

+

+   m = __import__(s)
+   for i in string.split(s, ".")[1:]:
+       m = getattr(m, i)
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 28 11:01:43 1999 by +GvR +

+ +

+

4.86. Basic thread wisdom

+Please note that there is no way to take advantage of +multiprocessor hardware using the Python thread model. The interpreter +uses a global interpreter lock (GIL), +which does not allow multiple threads to be concurrently active. +

+If you write a simple test program like this: +

+

+  import thread
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+

+none of the threads seem to run! The reason is that as soon as +the main thread exits, all threads are killed. +

+A simple fix is to add a sleep to the end of the program, +sufficiently long for all threads to finish: +

+

+  import thread, time
+  def run(name, n):
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10) # <----------------------------!
+

+But now (on many platforms) the threads don't run in parallel, +but appear to run sequentially, one at a time! The reason is +that the OS thread scheduler doesn't start a new thread until +the previous thread is blocked. +

+A simple fix is to add a tiny sleep to the start of the run +function: +

+

+  import thread, time
+  def run(name, n):
+      time.sleep(0.001) # <---------------------!
+      for i in range(n): print name, i
+  for i in range(10):
+      thread.start_new(run, (i, 100))
+  time.sleep(10)
+

+Some more hints: +

+Instead of using a time.sleep() call at the end, it's +better to use some kind of semaphore mechanism. One idea is to +use a the Queue module to create a queue object, let each thread +append a token to the queue when it finishes, and let the main +thread read as many tokens from the queue as there are threads. +

+Use the threading module instead of the thread module. It's part +of Python since version 1.5.1. It takes care of all these details, +and has many other nice features too! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:55 2003 by +GvR +

+ +

+

4.87. Why doesn't closing sys.stdout (stdin, stderr) really close it?

+Python file objects are a high-level layer of abstraction on top of C streams, which in turn are a medium-level layer of abstraction on top of (among other things) low-level C file descriptors. +

+For most file objects f you create in Python via the builtin "open" function, f.close() marks the Python file object as being closed from Python's point of view, and also arranges to close the underlying C stream. This happens automatically too, in f's destructor, when f becomes garbage. +

+But stdin, stdout and stderr are treated specially by Python, because of the special status also given to them by C: doing +

+

+    sys.stdout.close() # ditto for stdin and stderr
+

+marks the Python-level file object as being closed, but does not close the associated C stream (provided sys.stdout is still bound to its default value, which is the stream C also calls "stdout"). +

+To close the underlying C stream for one of these three, you should first be sure that's what you really want to do (e.g., you may confuse the heck out of extension modules trying to do I/O). If it is, use os.close: +

+

+    os.close(0)   # close C's stdin stream
+    os.close(1)   # close C's stdout stream
+    os.close(2)   # close C's stderr stream
+

+

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 17 02:22:35 1999 by +Tim Peters +

+ +

+

4.88. What kinds of global value mutation are thread-safe?

+[adapted from c.l.py responses by Gordon McMillan & GvR] +

+A global interpreter lock (GIL) is used internally to ensure that only one thread runs in the Python VM at a time. In general, Python offers to switch among threads only between bytecode instructions (how frequently it offers to switch can be set via sys.setcheckinterval). Each bytecode instruction-- and all the C implementation code reached from it --is therefore atomic. +

+In theory, this means an exact accounting requires an exact understanding of the PVM bytecode implementation. In practice, it means that operations on shared vrbls of builtin data types (ints, lists, dicts, etc) that "look atomic" really are. +

+For example, these are atomic (L, L1, L2 are lists, D, D1, D2 are dicts, x, y +are objects, i, j are ints): +

+

+    L.append(x)
+    L1.extend(L2)
+    x = L[i]
+    x = L.pop()
+    L1[i:j] = L2
+    L.sort()
+    x = y
+    x.field = y
+    D[x] = y
+    D1.update(D2)
+    D.keys()
+

+These aren't: +

+

+    i = i+1
+    L.append(L[-1])
+    L[i] = L[j]
+    D[x] = D[x] + 1
+

+Note: operations that replace other objects may invoke those other objects' __del__ method when their reference count reaches zero, and that can affect things. This is especially true for the mass updates to dictionaries and lists. When in doubt, use a mutex! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:21:03 2003 by +GvR +

+ +

+

4.89. How do I modify a string in place?

+Strings are immutable (see question 6.2) so you cannot modify a string +directly. If you need an object with this ability, try converting the +string to a list or take a look at the array module. +

+

+    >>> s = "Hello, world"
+    >>> a = list(s)
+    >>> print a
+    ['H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd']
+    >>> a[7:] = list("there!")
+    >>> import string
+    >>> print string.join(a, '')
+    'Hello, there!'
+

+

+    >>> import array
+    >>> a = array.array('c', s)
+    >>> print a
+    array('c', 'Hello, world')
+    >>> a[0] = 'y' ; print a
+    array('c', 'yello world')
+    >>> a.tostring()
+    'yello, world'
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 01:22:47 1999 by +Andrew Dalke +

+ +

+

4.90. How to pass on keyword/optional parameters/arguments

+Q: How can I pass on optional or keyword parameters from one function to another? +

+

+	def f1(a, *b, **c):
+		...
+

+A: In Python 2.0 and above: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		f1(x, *y, **z)
+

+

+   Note: y can be any sequence (e.g., list or tuple) and z must be a dict.
+

+

+A: For versions prior to 2.0, use 'apply', like: +

+

+	def f2(x, *y, **z):
+		...
+		z['width']='14.3c'
+		...
+		apply(f1, (x,)+y, z)
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:20:56 2002 by +Matthias Urlichs +

+ +

+

4.91. How can I get a dictionary to display its keys in a consistent order?

+In general, dictionaries store their keys in an unpredictable order, +so the display order of a dictionary's elements will be similarly +unpredictable. +(See +Question 6.12 +to understand why this is so.) +

+This can be frustrating if you want to save a printable version to a +file, make some changes and then compare it with some other printed +dictionary. If you have such needs you can subclass UserDict.UserDict +to create a SortedDict class that prints itself in a predictable order. +Here's one simpleminded implementation of such a class: +

+

+  import UserDict, string
+

+

+  class SortedDict(UserDict.UserDict):
+    def __repr__(self):
+      result = []
+      append = result.append
+      keys = self.data.keys()
+      keys.sort()
+      for k in keys:
+        append("%s: %s" % (`k`, `self.data[k]`))
+      return "{%s}" % string.join(result, ", ")
+

+

+    ___str__ = __repr__
+

+

+This will work for many common situations you might encounter, though +it's far from a perfect solution. (It won't have any effect on the +pprint module and does not transparently handle values that are or +contain dictionaries. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 16 17:31:06 1999 by +Skip Montanaro +

+ +

+

4.92. Is there a Python tutorial?

+Yes. See question 1.20 at +http://www.python.org/doc/FAQ.html#1.20 +

+ +Edit this entry / +Log info + +/ Last changed on Sat Dec 4 16:04:00 1999 by +TAB +

+ +

+

4.93. Deleted

+See 4.28 +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 28 20:40:37 2002 by +GvR +

+ +

+

4.94. How do I get a single keypress without blocking?

+There are several solutions; some involve using curses, which is a +pretty big thing to learn. Here's a solution without curses. (see also 4.74, for Windows, see question 8.2) +

+

+  import termios, fcntl, sys, os
+  fd = sys.stdin.fileno()
+

+

+  oldterm = termios.tcgetattr(fd)
+  newattr = termios.tcgetattr(fd)
+  newattr[3] = newattr[3] & ~termios.ICANON & ~termios.ECHO
+  termios.tcsetattr(fd, termios.TCSANOW, newattr)
+

+

+  oldflags = fcntl.fcntl(fd, fcntl.F_GETFL)
+  fcntl.fcntl(fd, fcntl.F_SETFL, oldflags | os.O_NONBLOCK)
+

+

+  try:
+      while 1:
+          try:
+              c = sys.stdin.read(1)
+              print "Got character", `c`
+          except IOError: pass
+  finally:
+      termios.tcsetattr(fd, termios.TCSAFLUSH, oldterm)
+      fcntl.fcntl(fd, fcntl.F_SETFL, oldflags)
+

+

+You need the termios and the fcntl module for any of this to work, +and I've only tried it on Linux, though it should work elsewhere. +

+In this code, characters are read and printed one at a time. +

+termios.tcsetattr() turns off stdin's echoing and disables canonical +mode. fcntl.fnctl() is used to obtain stdin's file descriptor flags +and modify them for non-blocking mode. Since reading stdin when it is +empty results in an IOError, this error is caught and ignored. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 24 00:39:06 2002 by +chris +

+ +

+

4.95. Is there an equivalent to Perl chomp()? (Remove trailing newline from string)

+There are two partial substitutes. If you want to remove all trailing +whitespace, use the method string.rstrip(). Otherwise, if there is only +one line in the string, use string.splitlines()[0]. +

+

+ -----------------------------------------------------------------------
+

+

+ rstrip() is too greedy, it strips all trailing white spaces.
+ splitlines() takes ControlM as line boundary.
+ Consider these strings as input:
+   "python python    \r\n"
+   "python\rpython\r\n"
+   "python python   \r\r\r\n"
+ The results from rstrip()/splitlines() are perhaps not what we want.
+

+

+ It seems re can perform this task.
+

+

+

+ #!/usr/bin/python 
+ # requires python2                                                             
+

+

+ import re, os, StringIO
+

+

+ lines=StringIO.StringIO(
+   "The Python Programming Language\r\n"
+   "The Python Programming Language \r \r \r\r\n"
+   "The\rProgramming\rLanguage\r\n"
+   "The\rProgramming\rLanguage\r\r\r\r\n"
+   "The\r\rProgramming\r\rLanguage\r\r\r\r\n"
+ )
+

+

+ ln=re.compile("(?:[\r]?\n|\r)$") # dos:\r\n, unix:\n, mac:\r, others: unknown
+ # os.linesep does not work if someone ftps(in binary mode) a dos/mac text file
+ # to your unix box
+ #ln=re.compile(os.linesep + "$")
+

+

+ while 1:
+   s=lines.readline()
+   if not s: break
+   print "1.(%s)" % `s.rstrip()`
+   print "2.(%s)" % `ln.sub( "", s, 1)`
+   print "3.(%s)" % `s.splitlines()[0]`
+   print "4.(%s)" % `s.splitlines()`
+   print
+

+

+ lines.close()
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 8 09:51:34 2001 by +Crystal +

+ +

+

4.96. Why is join() a string method when I'm really joining the elements of a (list, tuple, sequence)?

+Strings became much more like other standard types starting in release 1.6, when methods were added which give the same functionality that has always been available using the functions of the string module. These new methods have been widely accepted, but the one which appears to make (some) programmers feel uncomfortable is: +

+

+    ", ".join(['1', '2', '4', '8', '16'])
+

+which gives the result +

+

+    "1, 2, 4, 8, 16"
+

+There are two usual arguments against this usage. +

+The first runs along the lines of: "It looks really ugly using a method of a string literal (string constant)", to which the answer is that it might, but a string literal is just a fixed value. If the methods are to be allowed on names bound to strings there is no logical reason to make them unavailable on literals. Get over it! +

+The second objection is typically cast as: "I am really telling a sequence to join its members together with a string constant". Sadly, you aren't. For some reason there seems to be much less difficulty with having split() as a string method, since in that case it is easy to see that +

+

+    "1, 2, 4, 8, 16".split(", ")
+

+is an instruction to a string literal to return the substrings delimited by the given separator (or, by default, arbitrary runs of white space). In this case a Unicode string returns a list of Unicode strings, an ASCII string returns a list of ASCII strings, and everyone is happy. +

+join() is a string method because in using it you are telling the separator string to iterate over an arbitrary sequence, forming string representations of each of the elements, and inserting itself between the elements' representations. This method can be used with any argument which obeys the rules for sequence objects, inluding any new classes you might define yourself. +

+Because this is a string method it can work for Unicode strings as well as plain ASCII strings. If join() were a method of the sequence types then the sequence types would have to decide which type of string to return depending on the type of the separator. +

+If none of these arguments persuade you, then for the moment you can continue to use the join() function from the string module, which allows you to write +

+

+    string.join(['1', '2', '4', '8', '16'], ", ")
+

+You will just have to try and forget that the string module actually uses the syntax you are compaining about to implement the syntax you prefer! +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 2 15:51:58 2002 by +Steve Holden +

+ +

+

4.97. How can my code discover the name of an object?

+Generally speaking, it can't, because objects don't really have names. The assignment statement does not store the assigned value in the name but a reference to it. Essentially, assignment creates a binding of a name to a value. The same is true of def and class statements, but in that case the value is a callable. Consider the following code: +

+

+    class A:
+        pass
+

+

+    B = A
+

+

+    a = B()
+    b = a
+    print b
+    <__main__.A instance at 016D07CC>
+    print a
+    <__main__.A instance at 016D07CC>
+

+

+Arguably the class has a name: even though it is bound to two names and invoked through the name B the created instance is still reported as an instance of class A. However, it is impossible to say whether the instance's name is a or b, since both names are bound to the same value. +

+Generally speaking it should not be necessary for your code to "know the names" of particular values. Unless you are deliberately writing introspective programs, this is usually an indication that a change of approach might be beneficial. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 8 03:53:39 2001 by +Steve Holden +

+ +

+

4.98. Why are floating point calculations so inaccurate?

+The development version of the Python Tutorial now contains an Appendix with more info: +

+    http://www.python.org/doc/current/tut/node14.html
+

+People are often very surprised by results like this: +

+

+ >>> 1.2-1.0
+ 0.199999999999999996
+

+And think it is a bug in Python. It's not. It's a problem caused by +the internal representation of a floating point number. A floating point +number is stored as a fixed number of binary digits. +

+In decimal math, there are many numbers that can't be represented +with a fixed number of decimal digits, i.e. +1/3 = 0.3333333333....... +

+In the binary case, 1/2 = 0.1, 1/4 = 0.01, 1/8 = 0.001, etc. There are +a lot of numbers that can't be represented. The digits are cut off at +some point. +

+Since Python 1.6, a floating point's repr() function prints as many +digits are necessary to make eval(repr(f)) == f true for any float f. +The str() function prints the more sensible number that was probably +intended: +

+

+ >>> 0.2
+ 0.20000000000000001
+ >>> print 0.2
+ 0.2
+

+Again, this has nothing to do with Python, but with the way the +underlying C platform handles floating points, and ultimately with +the inaccuracy you'll always have when writing down numbers of fixed +number of digit strings. +

+One of the consequences of this is that it is dangerous to compare +the result of some computation to a float with == ! +Tiny inaccuracies may mean that == fails. +

+Instead try something like this: +

+

+ epsilon = 0.0000000000001 # Tiny allowed error
+ expected_result = 0.4
+

+

+ if expected_result-epsilon <= computation() <= expected_result+epsilon:
+    ...
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Apr 1 22:18:47 2002 by +Fred Drake +

+ +

+

4.99. I tried to open Berkeley DB file, but bsddb produces bsddb.error: (22, 'Invalid argument'). Help! How can I restore my data?

+Don't panic! Your data are probably intact. The most frequent cause +for the error is that you tried to open an earlier Berkeley DB file +with a later version of the Berkeley DB library. +

+Many Linux systems now have all three versions of Berkeley DB +available. If you are migrating from version 1 to a newer version use +db_dump185 to dump a plain text version of the database. +If you are migrating from version 2 to version 3 use db2_dump to create +a plain text version of the database. In either case, use db_load to +create a new native database for the latest version installed on your +computer. If you have version 3 of Berkeley DB installed, you should +be able to use db2_load to create a native version 2 database. +

+You should probably move away from Berkeley DB version 1 files because +the hash file code contains known bugs that can corrupt your data. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 29 16:04:29 2001 by +Skip Montanaro +

+ +

+

4.100. What are the "best practices" for using import in a module?

+First, the standard modules are great. Use them! The standard Python library is large and varied. Using modules can save you time and effort and will reduce maintainenance cost of your code. (Other programs are dedicated to supporting and fixing bugs in the standard Python modules. Coworkers may also be familiar with themodules that you use, reducing the amount of time it takes them to understand your code.) +

+The rest of this answer is largely a matter of personal preference, but here's what some newsgroup posters said (thanks to all who responded) +

+In general, don't use +

+ from modulename import *
+

+Doing so clutters the importer's namespace. Some avoid this idiom even with the few modules that were designed to be imported in this manner. (Modules designed in this manner include Tkinter, thread, and wxPython.) +

+Import modules at the top of a file, one module per line. Doing so makes it clear what other modules your code requires and avoids questions of whether the module name is in scope. Using one import per line makes it easy to add and delete module imports. +

+Move imports into a local scope (such as at the top of a function definition) if there are a lot of imports, and you're trying to avoid the cost (lots of initialization time) of many imports. This technique is especially helpful if many of the imports are unnecessary depending on how the program executes. You may also want to move imports into a function if the modules are only ever used in that function. Note that loading a module the first time may be expensive (because of the one time initialization of the module) but that loading a module multiple times is virtually free (a couple of dictionary lookups). Even if the module name has gone out of scope, the module is probably available in sys.modules. Thus, there isn't really anything wrong with putting no imports at the module level (if they aren't needed) and putting all of the imports at the function level. +

+It is sometimes necessary to move imports to a function or class to avoid problems with circular imports. Gordon says: +

+ Circular imports are fine where both modules use the "import <module>"
+ form of import. They fail when the 2nd module wants to grab a name
+ out of the first ("from module import name") and the import is at
+ the top level. That's because names in the 1st are not yet available,
+ (the first module is busy importing the 2nd).  
+

+In this case, if the 2nd module is only used in one function, then the import can easily be moved into that function. By the time the import is called, the first module will have finished initializing, and the second module can do its import. +

+It may also be necessary to move imports out of the top level of code +if some of the modules are platform-specific. In that case, it may not even be possible to import all of the modules at the top of the file. In this case, importing the correct modules in the corresponding platform-specific code is a good option. +

+If only instances of a specific class uses a module, then it is reasonable to import the module in the class's __init__ method and then assign the module to an instance variable so that the module is always available (via that instance variable) during the life of the object. Note that to delay an import until the class is instantiated, the import must be inside a method. Putting the import inside the class but outside of any method still causes the import to occur when the module is initialized. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 4 04:44:47 2001 by +TAB +

+ +

+

4.101. Is there a tool to help find bugs or perform static analysis?

+Yes. PyChecker is a static analysis tool for finding bugs +in Python source code as well as warning about code complexity +and style. +

+You can get PyChecker from: http://pychecker.sf.net. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Aug 10 15:42:11 2001 by +Neal +

+ +

+

4.102. UnicodeError: ASCII [decoding,encoding] error: ordinal not in range(128)

+This error indicates that your Python installation can handle +only 7-bit ASCII strings. There are a couple ways to fix or +workaround the problem. +

+If your programs must handle data in arbitary character set encodings, the environment the application runs in will generally identify the encoding of the data it is handing you. You need to convert the input to Unicode data using that encoding. For instance, a program that handles email or web input will typically find character set encoding information in Content-Type headers. This can then be used to properly convert input data to Unicode. Assuming the string referred to by "value" is encoded as UTF-8: +

+

+    value = unicode(value, "utf-8")
+

+will return a Unicode object. If the data is not correctly encoded as UTF-8, the above call will raise a UnicodeError. +

+If you only want strings coverted to Unicode which have non-ASCII data, you can try converting them first assuming an ASCII encoding, and then generate Unicode objects if that fails: +

+

+    try:
+        x = unicode(value, "ascii")
+    except UnicodeError:
+        value = unicode(value, "utf-8")
+    else:
+        # value was valid ASCII data
+        pass
+

+

+If you normally use a character set encoding other than US-ASCII and only need to handle data in that encoding, the simplest way to fix the problem may be simply to set the encoding in sitecustomize.py. The following code is just a modified version of the encoding setup code from site.py with the relevant lines uncommented. +

+

+    # Set the string encoding used by the Unicode implementation.
+    # The default is 'ascii'
+    encoding = "ascii" # <= CHANGE THIS if you wish
+

+

+    # Enable to support locale aware default string encodings.
+    import locale
+    loc = locale.getdefaultlocale()
+    if loc[1]:
+        encoding = loc[1]
+    if encoding != "ascii":
+        import sys
+        sys.setdefaultencoding(encoding)
+

+

+Also note that on Windows, there is an encoding known as "mbcs", which uses an encoding specific to your current locale. In many cases, and particularly when working with COM, this may be an appropriate default encoding to use. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 13 04:45:41 2002 by +Skip Montanaro +

+ +

+

4.103. Using strings to call functions/methods

+There are various techniques: +

+* Use a dictionary pre-loaded with strings and functions. The primary +advantage of this technique is that the strings do not need to match the +names of the functions. This is also the primary technique used to +emulate a case construct: +

+

+    def a():
+        pass
+

+

+    def b():
+        pass
+

+

+    dispatch = {'go': a, 'stop': b}  # Note lack of parens for funcs
+

+

+    dispatch[get_input()]()  # Note trailing parens to call function
+

+* Use the built-in function getattr(): +

+

+    import foo
+    getattr(foo, 'bar')()
+

+Note that getattr() works on any object, including classes, class +instances, modules, and so on. +

+This is used in several places in the standard library, like +this: +

+

+    class Foo:
+        def do_foo(self):
+            ...
+

+

+        def do_bar(self):
+            ...
+

+

+     f = getattr(foo_instance, 'do_' + opname)
+     f()
+

+

+* Use locals() or eval() to resolve the function name: +

+def myFunc(): +

+    print "hello"
+

+fname = "myFunc" +

+f = locals()[fname] +f() +

+f = eval(fname) +f() +

+Note: Using eval() can be dangerous. If you don't have absolute control +over the contents of the string, all sorts of things could happen... +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 08:14:58 2002 by +Erno Kuusela +

+ +

+

4.104. How fast are exceptions?

+A try/except block is extremely efficient. Actually executing an +exception is expensive. In older versions of Python (prior to 2.0), it +was common to code this idiom: +

+

+    try:
+        value = dict[key]
+    except KeyError:
+        dict[key] = getvalue(key)
+        value = dict[key]
+

+This idiom only made sense when you expected the dict to have the key +95% of the time or more; other times, you coded it like this: +

+

+    if dict.has_key(key):
+        value = dict[key]
+    else:
+        dict[key] = getvalue(key)
+        value = dict[key]
+

+In Python 2.0 and higher, of course, you can code this as +

+

+    value = dict.setdefault(key, getvalue(key))
+

+However this evaluates getvalue(key) always, regardless of whether it's needed or not. So if it's slow or has a side effect you should use one of the above variants. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 9 10:12:30 2002 by +Yeti +

+ +

+

4.105. Sharing global variables across modules

+The canonical way to share information across modules within a single +program is to create a special module (often called config or cfg). +Just import the config module in all modules of your application; the +module then becomes available as a global name. Because there is only +one instance of each module, any changes made to the module object get +reflected everywhere. For example: +

+config.py: +

+

+    pass
+

+mod.py: +

+

+    import config
+    config.x = 1
+

+main.py: +

+

+    import config
+    import mod
+    print config.x
+

+Note that using a module is also the basis for implementing the +Singleton design pattern, for the same reason. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Apr 23 23:07:19 2002 by +Aahz +

+ +

+

4.106. Why is cPickle so slow?

+Use the binary option. We'd like to make that the default, but it would +break backward compatibility: +

+

+    largeString = 'z' * (100 * 1024)
+    myPickle = cPickle.dumps(largeString, 1)
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Aug 22 19:54:25 2002 by +Aahz +

+ +

+

4.107. When importing module XXX, why do I get "undefined symbol: PyUnicodeUCS2_..." ?

+You are using a version of Python that uses a 4-byte representation for +Unicode characters, but the extension module you are importing (possibly +indirectly) was compiled using a Python that uses a 2-byte representation +for Unicode characters (the default). +

+If instead the name of the undefined symbol starts with PyUnicodeUCS4_, +the problem is the same by the relationship is reversed: Python was +built using 2-byte Unicode characters, and the extension module was +compiled using a Python with 4-byte Unicode characters. +

+This can easily occur when using pre-built extension packages. RedHat +Linux 7.x, in particular, provides a "python2" binary that is compiled +with 4-byte Unicode. This only causes the link failure if the extension +uses any of the PyUnicode_*() functions. It is also a problem if if an +extension uses any of the Unicode-related format specifiers for +Py_BuildValue (or similar) or parameter-specifications for +PyArg_ParseTuple(). +

+You can check the size of the Unicode character a Python interpreter is +using by checking the value of sys.maxunicode: +

+

+  >>> import sys
+  >>> if sys.maxunicode > 65535:
+  ...     print 'UCS4 build'
+  ... else:
+  ...     print 'UCS2 build'
+

+The only way to solve this problem is to use extension modules compiled +with a Python binary built using the same size for Unicode characters. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 27 15:00:17 2002 by +Fred Drake +

+ +

+

4.108. How do I create a .pyc file?

+QUESTION: +

+I have a module and I wish to generate a .pyc file. +How do I do it? Everything I read says that generation of a .pyc file is +"automatic", but I'm not getting anywhere. +

+

+ANSWER: +

+When a module is imported for the first time (or when the source is more +recent than the current compiled file) a .pyc file containing the compiled code should be created in the +same directory as the .py file. +

+One reason that a .pyc file may not be created is permissions problems with the directory. This can happen, for example, if you develop as one user but run as another, such as if you are testing with a web server. +

+However, in most cases, that's not the problem. +

+Creation of a .pyc file is "automatic" if you are importing a module and Python has the +ability (permissions, free space, etc...) to write the compiled module +back to the directory. But note that running Python on a top level script is not considered an +import and so no .pyc will be created automatically. For example, if you have a top-level module abc.py that imports another module xyz.py, when you run abc, xyz.pyc will be created since xyz is imported, but no abc.pyc file will be created since abc isn't imported. +

+If you need to create abc.pyc -- that is, to create a .pyc file for a +module that is not imported -- you can. (Look up +the py_compile and compileall modules in the Library Reference.) +

+You can manually compile any module using the "py_compile" module. One +way is to use the compile() function in that module interactively: +

+

+    >>> import py_compile
+    >>> py_compile.compile('abc.py')
+

+This will write the .pyc to the same location as abc.py (or you +can override that with the optional parameter cfile). +

+You can also automatically compile all files in a directory or +directories using the "compileall" module, which can also be run +straight from the command line. +

+You can do it from the shell (or DOS) prompt by entering: +

+       python compile.py abc.py
+

+or +

+       python compile.py *
+

+Or you can write a script to do it on a list of filenames that you enter. +

+

+     import sys
+     from py_compile import compile
+

+

+     if len(sys.argv) <= 1:
+        sys.exit(1)
+

+

+     for file in sys.argv[1:]:
+        compile(file)
+

+ACKNOWLEDGMENTS: +

+Steve Holden, David Bolen, Rich Somerfield, Oleg Broytmann, Steve Ferg +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 12 15:58:25 2003 by +Stephen Ferg +

+ +

+

5. Extending Python

+ +

+

5.1. Can I create my own functions in C?

+Yes, you can create built-in modules containing functions, +variables, exceptions and even new types in C. This is explained in +the document "Extending and Embedding the Python Interpreter" (http://www.python.org/doc/current/ext/ext.html). Also read the chapter +on dynamic loading. +

+There's more information on this in each of the Python books: +Programming Python, Internet Programming with Python, and Das Python-Buch +(in German). +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 10 05:18:57 2001 by +Fred L. Drake, Jr. +

+ +

+

5.2. Can I create my own functions in C++?

+Yes, using the C-compatibility features found in C++. Basically +you place extern "C" { ... } around the Python include files and put +extern "C" before each function that is going to be called by the +Python interpreter. Global or static C++ objects with constructors +are probably not a good idea. +

+ +Edit this entry / +Log info +

+ +

+

5.3. How can I execute arbitrary Python statements from C?

+The highest-level function to do this is PyRun_SimpleString() which takes +a single string argument which is executed in the context of module +__main__ and returns 0 for success and -1 when an exception occurred +(including SyntaxError). If you want more control, use PyRun_String(); +see the source for PyRun_SimpleString() in Python/pythonrun.c. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 20:08:14 1997 by +Bill Tutt +

+ +

+

5.4. How can I evaluate an arbitrary Python expression from C?

+Call the function PyRun_String() from the previous question with the +start symbol eval_input (Py_eval_input starting with 1.5a1); it +parses an expression, evaluates it and returns its value. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:23:18 1997 by +David Ascher +

+ +

+

5.5. How do I extract C values from a Python object?

+That depends on the object's type. If it's a tuple, +PyTupleSize(o) returns its length and PyTuple_GetItem(o, i) +returns its i'th item; similar for lists with PyListSize(o) +and PyList_GetItem(o, i). For strings, PyString_Size(o) returns +its length and PyString_AsString(o) a pointer to its value +(note that Python strings may contain null bytes so strlen() +is not safe). To test which type an object is, first make sure +it isn't NULL, and then use PyString_Check(o), PyTuple_Check(o), +PyList_Check(o), etc. +

+There is also a high-level API to Python objects which is +provided by the so-called 'abstract' interface -- read +Include/abstract.h for further details. It allows for example +interfacing with any kind of Python sequence (e.g. lists and tuples) +using calls like PySequence_Length(), PySequence_GetItem(), etc.) +as well as many other useful protocols. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:34:20 1997 by +David Ascher +

+ +

+

5.6. How do I use Py_BuildValue() to create a tuple of arbitrary length?

+You can't. Use t = PyTuple_New(n) instead, and fill it with +objects using PyTuple_SetItem(t, i, o) -- note that this "eats" a +reference count of o. Similar for lists with PyList_New(n) and +PyList_SetItem(l, i, o). Note that you must set all the tuple items to +some value before you pass the tuple to Python code -- +PyTuple_New(n) initializes them to NULL, which isn't a valid Python +value. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 18:15:29 1997 by +Guido van Rossum +

+ +

+

5.7. How do I call an object's method from C?

+The PyObject_CallMethod() function can be used to call an arbitrary +method of an object. The parameters are the object, the name of the +method to call, a format string like that used with Py_BuildValue(), and the argument values: +

+

+    PyObject *
+    PyObject_CallMethod(PyObject *object, char *method_name,
+                        char *arg_format, ...);
+

+This works for any object that has methods -- whether built-in or +user-defined. You are responsible for eventually DECREF'ing the +return value. +

+To call, e.g., a file object's "seek" method with arguments 10, 0 +(assuming the file object pointer is "f"): +

+

+        res = PyObject_CallMethod(f, "seek", "(ii)", 10, 0);
+        if (res == NULL) {
+                ... an exception occurred ...
+        }
+        else {
+                Py_DECREF(res);
+        }
+

+Note that since PyObject_CallObject() always wants a tuple for the +argument list, to call a function without arguments, pass "()" for the +format, and to call a function with one argument, surround the argument +in parentheses, e.g. "(i)". +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 6 16:15:46 2002 by +Neal Norwitz +

+ +

+

5.8. How do I catch the output from PyErr_Print() (or anything that prints to stdout/stderr)?

+(Due to Mark Hammond): +

+In Python code, define an object that supports the "write()" method. +Redirect sys.stdout and sys.stderr to this object. +Call print_error, or just allow the standard traceback mechanism to +work. Then, the output will go wherever your write() method sends it. +

+The easiest way to do this is to use the StringIO class in the standard +library. +

+Sample code and use for catching stdout: +

+	>>> class StdoutCatcher:
+	...  def __init__(self):
+	...   self.data = ''
+	...  def write(self, stuff):
+	...   self.data = self.data + stuff
+	...  
+	>>> import sys
+	>>> sys.stdout = StdoutCatcher()
+	>>> print 'foo'
+	>>> print 'hello world!'
+	>>> sys.stderr.write(sys.stdout.data)
+	foo
+	hello world!
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 16 18:34:25 1998 by +Richard Jones +

+ +

+

5.9. How do I access a module written in Python from C?

+You can get a pointer to the module object as follows: +

+

+        module = PyImport_ImportModule("<modulename>");
+

+If the module hasn't been imported yet (i.e. it is not yet present in +sys.modules), this initializes the module; otherwise it simply returns +the value of sys.modules["<modulename>"]. Note that it doesn't enter +the module into any namespace -- it only ensures it has been +initialized and is stored in sys.modules. +

+You can then access the module's attributes (i.e. any name defined in +the module) as follows: +

+

+        attr = PyObject_GetAttrString(module, "<attrname>");
+

+Calling PyObject_SetAttrString(), to assign to variables in the module, also works. +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 22:56:40 1997 by +david ascher +

+ +

+

5.10. How do I interface to C++ objects from Python?

+Depending on your requirements, there are many approaches. To do +this manually, begin by reading the "Extending and Embedding" document +(Doc/ext.tex, see also http://www.python.org/doc/). Realize +that for the Python run-time system, there isn't a whole lot of +difference between C and C++ -- so the strategy to build a new Python +type around a C structure (pointer) type will also work for C++ +objects. +

+A useful automated approach (which also works for C) is SWIG: +http://www.swig.org/. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 15 05:14:01 1999 by +Sjoerd Mullender +

+ +

+

5.11. mSQLmodule (or other old module) won't build with Python 1.5 (or later)

+Since python-1.4 "Python.h" will have the file includes needed in an +extension module. +Backward compatibility is dropped after version 1.4 and therefore +mSQLmodule.c will not build as "allobjects.h" cannot be found. +The following change in mSQLmodule.c is harmless when building it with +1.4 and necessary when doing so for later python versions: +

+Remove lines: +

+

+	#include "allobjects.h"
+	#include "modsupport.h"
+

+And insert instead: +

+

+	#include "Python.h"
+

+You may also need to add +

+

+                #include "rename2.h"
+

+if the module uses "old names". +

+This may happen with other ancient python modules as well, +and the same fix applies. +

+ +Edit this entry / +Log info + +/ Last changed on Sun Dec 21 02:03:35 1997 by +GvR +

+ +

+

5.12. I added a module using the Setup file and the make fails! Huh?

+Setup must end in a newline, if there is no newline there it gets +very sad. Aside from this possibility, maybe you have other +non-Python-specific linkage problems. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 24 15:54:01 1997 by +aaron watters +

+ +

+

5.13. I want to compile a Python module on my Red Hat Linux system, but some files are missing.

+Red Hat's RPM for Python doesn't include the +/usr/lib/python1.x/config/ directory, which contains various files required +for compiling Python extensions. +Install the python-devel RPM to get the necessary files. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 26 13:44:04 1999 by +A.M. Kuchling +

+ +

+

5.14. What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean?

+This means that you have created an extension module named "yourmodule", but your module init function does not initialize with that name. +

+Every module init function will have a line similar to: +

+

+  module = Py_InitModule("yourmodule", yourmodule_functions);
+

+If the string passed to this function is not the same name as your extenion module, the SystemError will be raised. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 25 07:16:08 1999 by +Mark Hammond +

+ +

+

5.15. How to tell "incomplete input" from "invalid input"?

+Sometimes you want to emulate the Python interactive interpreter's +behavior, where it gives you a continuation prompt when the input +is incomplete (e.g. you typed the start of an "if" statement +or you didn't close your parentheses or triple string quotes), +but it gives you a syntax error message immediately when the input +is invalid. +

+In Python you can use the codeop module, which approximates the +parser's behavior sufficiently. IDLE uses this, for example. +

+The easiest way to do it in C is to call PyRun_InteractiveLoop() +(in a separate thread maybe) and let the Python interpreter handle +the input for you. You can also set the PyOS_ReadlineFunctionPointer +to point at your custom input function. See Modules/readline.c and +Parser/myreadline.c for more hints. +

+However sometimes you have to run the embedded Python interpreter +in the same thread as your rest application and you can't allow the +PyRun_InteractiveLoop() to stop while waiting for user input. +The one solution then is to call PyParser_ParseString() +and test for e.error equal to E_EOF (then the input is incomplete). +Sample code fragment, untested, inspired by code from Alex Farber: +

+

+  #include <Python.h>
+  #include <node.h>
+  #include <errcode.h>
+  #include <grammar.h>
+  #include <parsetok.h>
+  #include <compile.h>
+

+

+  int testcomplete(char *code)
+    /* code should end in \n */
+    /* return -1 for error, 0 for incomplete, 1 for complete */
+  {
+    node *n;
+    perrdetail e;
+

+

+    n = PyParser_ParseString(code, &_PyParser_Grammar,
+                             Py_file_input, &e);
+    if (n == NULL) {
+      if (e.error == E_EOF) 
+        return 0;
+      return -1;
+    }
+

+

+    PyNode_Free(n);
+    return 1;
+  }
+

+Another solution is trying to compile the received string with +Py_CompileString(). If it compiles fine - try to execute the returned +code object by calling PyEval_EvalCode(). Otherwise save the input for +later. If the compilation fails, find out if it's an error or just +more input is required - by extracting the message string from the +exception tuple and comparing it to the "unexpected EOF while parsing". +Here is a complete example using the GNU readline library (you may +want to ignore SIGINT while calling readline()): +

+

+  #include <stdio.h>
+  #include <readline.h>
+

+

+  #include <Python.h>
+  #include <object.h>
+  #include <compile.h>
+  #include <eval.h>
+

+

+  int main (int argc, char* argv[])
+  {
+    int i, j, done = 0;                          /* lengths of line, code */
+    char ps1[] = ">>> ";
+    char ps2[] = "... ";
+    char *prompt = ps1;
+    char *msg, *line, *code = NULL;
+    PyObject *src, *glb, *loc;
+    PyObject *exc, *val, *trb, *obj, *dum;
+

+

+    Py_Initialize ();
+    loc = PyDict_New ();
+    glb = PyDict_New ();
+    PyDict_SetItemString (glb, "__builtins__", PyEval_GetBuiltins ());
+

+

+    while (!done)
+    {
+      line = readline (prompt);
+

+

+      if (NULL == line)                          /* CTRL-D pressed */
+      {
+        done = 1;
+      }
+      else
+      {
+        i = strlen (line);
+

+

+        if (i > 0)
+          add_history (line);                    /* save non-empty lines */
+

+

+        if (NULL == code)                        /* nothing in code yet */
+          j = 0;
+        else
+          j = strlen (code);
+

+

+        code = realloc (code, i + j + 2);
+        if (NULL == code)                        /* out of memory */
+          exit (1);
+

+

+        if (0 == j)                              /* code was empty, so */
+          code[0] = '\0';                        /* keep strncat happy */
+

+

+        strncat (code, line, i);                 /* append line to code */
+        code[i + j] = '\n';                      /* append '\n' to code */
+        code[i + j + 1] = '\0';
+

+

+        src = Py_CompileString (code, "<stdin>", Py_single_input);       
+

+

+        if (NULL != src)                         /* compiled just fine - */
+        {
+          if (ps1  == prompt ||                  /* ">>> " or */
+              '\n' == code[i + j - 1])           /* "... " and double '\n' */
+          {                                               /* so execute it */
+            dum = PyEval_EvalCode ((PyCodeObject *)src, glb, loc);
+            Py_XDECREF (dum);
+            Py_XDECREF (src);
+            free (code);
+            code = NULL;
+            if (PyErr_Occurred ())
+              PyErr_Print ();
+            prompt = ps1;
+          }
+        }                                        /* syntax error or E_EOF? */
+        else if (PyErr_ExceptionMatches (PyExc_SyntaxError))           
+        {
+          PyErr_Fetch (&exc, &val, &trb);        /* clears exception! */
+

+

+          if (PyArg_ParseTuple (val, "sO", &msg, &obj) &&
+              !strcmp (msg, "unexpected EOF while parsing")) /* E_EOF */
+          {
+            Py_XDECREF (exc);
+            Py_XDECREF (val);
+            Py_XDECREF (trb);
+            prompt = ps2;
+          }
+          else                                   /* some other syntax error */
+          {
+            PyErr_Restore (exc, val, trb);
+            PyErr_Print ();
+            free (code);
+            code = NULL;
+            prompt = ps1;
+          }
+        }
+        else                                     /* some non-syntax error */
+        {
+          PyErr_Print ();
+          free (code);
+          code = NULL;
+          prompt = ps1;
+        }
+

+

+        free (line);
+      }
+    }
+

+

+    Py_XDECREF(glb);
+    Py_XDECREF(loc);
+    Py_Finalize();
+    exit(0);
+  }
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 15 09:47:24 2000 by +Alex Farber +

+ +

+

5.16. How do I debug an extension?

+When using gdb with dynamically loaded extensions, you can't set a +breakpoint in your extension until your extension is loaded. +

+In your .gdbinit file (or interactively), add the command +

+br _PyImport_LoadDynamicModule +

+

+$ gdb /local/bin/python +

+gdb) run myscript.py +

+gdb) continue # repeat until your extension is loaded +

+gdb) finish # so that your extension is loaded +

+gdb) br myfunction.c:50 +

+gdb) continue +

+ +Edit this entry / +Log info + +/ Last changed on Fri Oct 20 11:10:32 2000 by +Joe VanAndel +

+ +

+

5.17. How do I find undefined Linux g++ symbols, __builtin_new or __pure_virtural

+To dynamically load g++ extension modules, you must recompile python, relink python using g++ (change LINKCC in the python Modules Makefile), and link your extension module using g++ (e.g., "g++ -shared -o mymodule.so mymodule.o"). +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 14 18:03:51 2001 by +douglas orr +

+ +

+

5.18. How do I define and create objects corresponding to built-in/extension types

+Usually you would like to be able to inherit from a Python type when +you ask this question. The bottom line for Python 2.2 is: types and classes are miscible. You build instances by calling classes, and you can build subclasses to your heart's desire. +

+You need to be careful when instantiating immutable types like integers or strings. See http://www.amk.ca/python/2.2/, section 2, for details. +

+Prior to version 2.2, Python (like Java) insisted that there are first-class and second-class objects (the former are types, the latter classes), and never the twain shall meet. +

+The library has, however, done a good job of providing class wrappers for the more commonly desired objects (see UserDict, UserList and UserString for examples), and more are always welcome if you happen to be in the mood to write code. These wrappers still exist in Python 2.2. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 10 15:14:07 2002 by +Matthias Urlichs +

+ +

+

6. Python's design

+ +

+

6.1. Why isn't there a switch or case statement in Python?

+You can do this easily enough with a sequence of +if... elif... elif... else. There have been some proposals for switch +statement syntax, but there is no consensus (yet) on whether and how +to do range tests. +

+ +Edit this entry / +Log info +

+ +

+

6.2. Why does Python use indentation for grouping of statements?

+Basically I believe that using indentation for grouping is +extremely elegant and contributes a lot to the clarity of the average +Python program. Most people learn to love this feature after a while. +Some arguments for it: +

+Since there are no begin/end brackets there cannot be a disagreement +between grouping perceived by the parser and the human reader. I +remember long ago seeing a C fragment like this: +

+

+        if (x <= y)
+                x++;
+                y--;
+        z++;
+

+and staring a long time at it wondering why y was being decremented +even for x > y... (And I wasn't a C newbie then either.) +

+Since there are no begin/end brackets, Python is much less prone to +coding-style conflicts. In C there are loads of different ways to +place the braces (including the choice whether to place braces around +single statements in certain cases, for consistency). If you're used +to reading (and writing) code that uses one style, you will feel at +least slightly uneasy when reading (or being required to write) +another style. +Many coding styles place begin/end brackets on a line by themself. +This makes programs considerably longer and wastes valuable screen +space, making it harder to get a good overview over a program. +Ideally, a function should fit on one basic tty screen (say, 20 +lines). 20 lines of Python are worth a LOT more than 20 lines of C. +This is not solely due to the lack of begin/end brackets (the lack of +declarations also helps, and the powerful operations of course), but +it certainly helps! +

+ +Edit this entry / +Log info + +/ Last changed on Wed May 21 16:00:15 1997 by +GvR +

+ +

+

6.3. Why are Python strings immutable?

+There are two advantages. One is performance: knowing that a +string is immutable makes it easy to lay it out at construction time +-- fixed and unchanging storage requirements. (This is also one of +the reasons for the distinction between tuples and lists.) The +other is that strings in Python are considered as "elemental" as +numbers. No amount of activity will change the value 8 to anything +else, and in Python, no amount of activity will change the string +"eight" to anything else. (Adapted from Jim Roskind) +

+ +Edit this entry / +Log info +

+ +

+

6.4. Delete

+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Jan 2 03:05:25 2001 by +Moshe Zadka +

+ +

+

6.5. Why does Python use methods for some functionality (e.g. list.index()) but functions for other (e.g. len(list))?

+The major reason is history. Functions were used for those +operations that were generic for a group of types and which +were intended to work even for objects that didn't have +methods at all (e.g. numbers before type/class unification +began, or tuples). +

+It is also convenient to have a function that can readily be applied +to an amorphous collection of objects when you use the functional features of Python (map(), apply() et al). +

+In fact, implementing len(), max(), min() as a built-in function is +actually less code than implementing them as methods for each type. +One can quibble about individual cases but it's a part of Python, +and it's too late to change such things fundamentally now. The +functions have to remain to avoid massive code breakage. +

+Note that for string operations Python has moved from external functions +(the string module) to methods. However, len() is still a function. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 30 14:08:58 2002 by +Steve Holden +

+ +

+

6.6. Why can't I derive a class from built-in types (e.g. lists or files)?

+As of Python 2.2, you can derive from built-in types. For previous versions, the answer is: +

+This is caused by the relatively late addition of (user-defined) +classes to the language -- the implementation framework doesn't easily +allow it. See the answer to question 4.2 for a work-around. This +may be fixed in the (distant) future. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 02:53:22 2002 by +Neal Norwitz +

+ +

+

6.7. Why must 'self' be declared and used explicitly in method definitions and calls?

+So, is your current programming language C++ or Java? :-) +When classes were added to Python, this was (again) the simplest way of +implementing methods without too many changes to the interpreter. The +idea was borrowed from Modula-3. It turns out to be very useful, for +a variety of reasons. +

+First, it makes it more obvious that you are using a method or +instance attribute instead of a local variable. Reading "self.x" or +"self.meth()" makes it absolutely clear that an instance variable or +method is used even if you don't know the class definition by heart. +In C++, you can sort of tell by the lack of a local variable +declaration (assuming globals are rare or easily recognizable) -- but +in Python, there are no local variable declarations, so you'd have to +look up the class definition to be sure. +

+Second, it means that no special syntax is necessary if you want to +explicitly reference or call the method from a particular class. In +C++, if you want to use a method from base class that is overridden in +a derived class, you have to use the :: operator -- in Python you can +write baseclass.methodname(self, <argument list>). This is +particularly useful for __init__() methods, and in general in cases +where a derived class method wants to extend the base class method of +the same name and thus has to call the base class method somehow. +

+Lastly, for instance variables, it solves a syntactic problem with +assignment: since local variables in Python are (by definition!) those +variables to which a value assigned in a function body (and that +aren't explicitly declared global), there has to be some way to tell +the interpreter that an assignment was meant to assign to an instance +variable instead of to a local variable, and it should preferably be +syntactic (for efficiency reasons). C++ does this through +declarations, but Python doesn't have declarations and it would be a +pity having to introduce them just for this purpose. Using the +explicit "self.var" solves this nicely. Similarly, for using instance +variables, having to write "self.var" means that references to +unqualified names inside a method don't have to search the instance's +directories. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 12 08:01:50 2001 by +Steve Holden +

+ +

+

6.8. Can't you emulate threads in the interpreter instead of relying on an OS-specific thread implementation?

+Answer 1: Unfortunately, the interpreter pushes at least one C stack +frame for each Python stack frame. Also, extensions can call back into +Python at almost random moments. Therefore a complete threads +implementation requires thread support for C. +

+Answer 2: Fortunately, there is Stackless Python, which has a completely redesigned interpreter loop that avoids the C stack. It's still experimental but looks very promising. Although it is binary compatible with standard Python, it's still unclear whether Stackless will make it into the core -- maybe it's just too revolutionary. Stackless Python currently lives here: http://www.stackless.com. A microthread implementation that uses it can be found here: http://world.std.com/~wware/uthread.html. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Apr 15 08:18:16 2000 by +Just van Rossum +

+ +

+

6.9. Why can't lambda forms contain statements?

+Python lambda forms cannot contain statements because Python's +syntactic framework can't handle statements nested inside expressions. +

+However, in Python, this is not a serious problem. Unlike lambda +forms in other languages, where they add functionality, Python lambdas +are only a shorthand notation if you're too lazy to define a function. +

+Functions are already first class objects in Python, and can be +declared in a local scope. Therefore the only advantage of using a +lambda form instead of a locally-defined function is that you don't need to invent a name for the function -- but that's just a local variable to which the function object (which is exactly the same type of object that a lambda form yields) is assigned! +

+ +Edit this entry / +Log info + +/ Last changed on Sun Jun 14 14:15:17 1998 by +Tim Peters +

+ +

+

6.10. [deleted]

+[lambda vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:20:56 2002 by +Erno Kuusela +

+ +

+

6.11. [deleted]

+[recursive functions vs non-nested scopes used to be here] +

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:22:04 2002 by +Erno Kuusela +

+ +

+

6.12. Why is there no more efficient way of iterating over a dictionary than first constructing the list of keys()?

+As of Python 2.2, you can now iterate over a dictionary directly, +using the new implied dictionary iterator: +

+

+    for k in d: ...
+

+There are also methods returning iterators over the values and items: +

+

+    for k in d.iterkeys(): # same as above
+    for v in d.itervalues(): # iterate over values
+    for k, v in d.iteritems(): # iterate over items
+

+All these require that you do not modify the dictionary during the loop. +

+For previous Python versions, the following defense should do: +

+Have you tried it? I bet it's fast enough for your purposes! In +most cases such a list takes only a few percent of the space occupied +by the dictionary. Apart from the fixed header, +the list needs only 4 bytes (the size of a pointer) per +key. A dictionary uses 12 bytes per key plus between 30 and 70 +percent hash table overhead, plus the space for the keys and values. +By necessity, all keys are distinct objects, and a string object (the most +common key type) costs at least 20 bytes plus the length of the +string. Add to that the values contained in the dictionary, and you +see that 4 bytes more per item really isn't that much more memory... +

+A call to dict.keys() makes one fast scan over the dictionary +(internally, the iteration function does exist) copying the pointers +to the key objects into a pre-allocated list object of the right size. +The iteration time isn't lost (since you'll have to iterate anyway -- +unless in the majority of cases your loop terminates very prematurely +(which I doubt since you're getting the keys in random order). +

+I don't expose the dictionary iteration operation to Python +programmers because the dictionary shouldn't be modified during the +entire iteration -- if it is, there's a small chance that the +dictionary is reorganized because the hash table becomes too full, and +then the iteration may miss some items and see others twice. Exactly +because this only occurs rarely, it would lead to hidden bugs in +programs: it's easy never to have it happen during test runs if you +only insert or delete a few items per iteration -- but your users will +surely hit upon it sooner or later. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:24:08 2002 by +GvR +

+ +

+

6.13. Can Python be compiled to machine code, C or some other language?

+Not easily. Python's high level data types, dynamic typing of +objects and run-time invocation of the interpreter (using eval() or +exec) together mean that a "compiled" Python program would probably +consist mostly of calls into the Python run-time system, even for +seemingly simple operations like "x+1". +

+Several projects described in the Python newsgroup or at past +Python conferences have shown that this approach is feasible, +although the speedups reached so far are only modest (e.g. 2x). +JPython uses the same strategy for compiling to Java bytecode. +(Jim Hugunin has demonstrated that in combination with whole-program +analysis, speedups of 1000x are feasible for small demo programs. +See the website for the 1997 Python conference.) +

+Internally, Python source code is always translated into a "virtual +machine code" or "byte code" representation before it is interpreted +(by the "Python virtual machine" or "bytecode interpreter"). In order +to avoid the overhead of parsing and translating modules that rarely +change over and over again, this byte code is written on a file whose +name ends in ".pyc" whenever a module is parsed (from a file whose +name ends in ".py"). When the corresponding .py file is changed, it +is parsed and translated again and the .pyc file is rewritten. +

+There is no performance difference once the .pyc file has been loaded +(the bytecode read from the .pyc file is exactly the same as the bytecode +created by direct translation). The only difference is that loading +code from a .pyc file is faster than parsing and translating a .py +file, so the presence of precompiled .pyc files will generally improve +start-up time of Python scripts. If desired, the Lib/compileall.py +module/script can be used to force creation of valid .pyc files for a +given set of modules. +

+Note that the main script executed by Python, even if its filename +ends in .py, is not compiled to a .pyc file. It is compiled to +bytecode, but the bytecode is not saved to a file. +

+If you are looking for a way to translate Python programs in order to +distribute them in binary form, without the need to distribute the +interpreter and library as well, have a look at the freeze.py script +in the Tools/freeze directory. This creates a single binary file +incorporating your program, the Python interpreter, and those parts of +the Python library that are needed by your program. Of course, the +resulting binary will only run on the same type of platform as that +used to create it. +

+Newsflash: there are now several programs that do this, to some extent. +Look for Psyco, Pyrex, PyInline, Py2Cmod, and Weave. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:26:19 2002 by +GvR +

+ +

+

6.14. How does Python manage memory?

+The details of Python memory management depend on the implementation. +The standard Python implementation (the C implementation) uses reference +counting and another mechanism to collect reference cycles. +

+Jython relies on the Java runtime; so it uses +the JVM's garbage collector. This difference can cause some subtle +porting problems if your Python code depends on the behavior of +the reference counting implementation. +

+The reference cycle collector was added in CPython 2.0. It +periodically executes a cycle detection algorithm which looks for inaccessible cycles and deletes the objects involved. A new gc module provides functions to perform a garbage collection, obtain debugging statistics, and tuning the collector's parameters. +

+The detection of cycles can be disabled when Python is compiled, if you can't afford even a tiny speed penalty or suspect that the cycle collection is buggy, by specifying the "--without-cycle-gc" switch when running the configure script. +

+Sometimes objects get stuck in "tracebacks" temporarily and hence are not deallocated when you might expect. Clear the tracebacks via +

+

+       import sys
+       sys.exc_traceback = sys.last_traceback = None
+

+Tracebacks are used for reporting errors and implementing debuggers and related things. They contain a portion of the program state extracted during the handling of an exception (usually the most recent exception). +

+In the absence of circularities and modulo tracebacks, Python programs need not explicitly manage memory. +

+Why python doesn't use a more traditional garbage collection +scheme? For one thing, unless this were +added to C as a standard feature, it's a portability pain in the ass. +And yes, I know about the Xerox library. It has bits of assembler +code for most common platforms. Not for all. And although it is +mostly transparent, it isn't completely transparent (when I once +linked Python with it, it dumped core). +

+Traditional GC also becomes a problem when Python gets embedded into +other applications. While in a stand-alone Python it may be fine to +replace the standard malloc() and free() with versions provided by the +GC library, an application embedding Python may want to have its own +substitute for malloc() and free(), and may not want Python's. Right +now, Python works with anything that implements malloc() and free() +properly. +

+In Jython, the following code (which is +fine in C Python) will probably run out of file descriptors long before +it runs out of memory: +

+

+        for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+

+Using the current reference counting and destructor scheme, each new +assignment to f closes the previous file. Using GC, this is not +guaranteed. Sure, you can think of ways to fix this. But it's not +off-the-shelf technology. If you want to write code that will +work with any Python implementation, you should explicitly close +the file; this will work regardless of GC: +

+

+       for file in <very long list of files>:
+                f = open(file)
+                c = f.read(1)
+                f.close()
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Mar 21 05:35:38 2002 by +Erno Kuusela +

+ +

+

6.15. Why are there separate tuple and list data types?

+This is done so that tuples can be immutable while lists are mutable. +

+Immutable tuples are useful in situations where you need to pass a few +items to a function and don't want the function to modify the tuple; +for example, +

+

+	point1 = (120, 140)
+	point2 = (200, 300)
+	record(point1, point2)
+	draw(point1, point2)
+

+You don't want to have to think about what would happen if record() +changed the coordinates -- it can't, because the tuples are immutable. +

+On the other hand, when creating large lists dynamically, it is +absolutely crucial that they are mutable -- adding elements to a tuple +one by one requires using the concatenation operator, which makes it +quadratic in time. +

+As a general guideline, use tuples like you would use structs in C or +records in Pascal, use lists like (variable length) arrays. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:26:03 1997 by +GvR +

+ +

+

6.16. How are lists implemented?

+Despite what a Lisper might think, Python's lists are really +variable-length arrays. The implementation uses a contiguous +array of references to other objects, and keeps a pointer +to this array (as well as its length) in a list head structure. +

+This makes indexing a list (a[i]) an operation whose cost is +independent of the size of the list or the value of the index. +

+When items are appended or inserted, the array of references is resized. +Some cleverness is applied to improve the performance of appending +items repeatedly; when the array must be grown, some extra space +is allocated so the next few times don't require an actual resize. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 15:32:24 1997 by +GvR +

+ +

+

6.17. How are dictionaries implemented?

+Python's dictionaries are implemented as resizable hash tables. +

+Compared to B-trees, this gives better performance for lookup +(the most common operation by far) under most circumstances, +and the implementation is simpler. +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 23:51:14 1997 by +Vladimir Marangozov +

+ +

+

6.18. Why must dictionary keys be immutable?

+The hash table implementation of dictionaries uses a hash value +calculated from the key value to find the key. If the key were +a mutable object, its value could change, and thus its hash could +change. But since whoever changes the key object can't tell that +is incorporated in a dictionary, it can't move the entry around in +the dictionary. Then, when you try to look up the same object +in the dictionary, it won't be found, since its hash value is different; +and if you try to look up the old value, it won't be found either, +since the value of the object found in that hash bin differs. +

+If you think you need to have a dictionary indexed with a list, +try to use a tuple instead. The function tuple(l) creates a tuple +with the same entries as the list l. +

+Some unacceptable solutions that have been proposed: +

+- Hash lists by their address (object ID). This doesn't work because +if you construct a new list with the same value it won't be found; +e.g., +

+

+  d = {[1,2]: '12'}
+  print d[[1,2]]
+

+will raise a KeyError exception because the id of the [1,2] used +in the second line differs from that in the first line. +In other words, dictionary keys should be compared using '==', not using 'is'. +

+- Make a copy when using a list as a key. This doesn't work because +the list (being a mutable object) could contain a reference to itself, +and then the copying code would run into an infinite loop. +

+- Allow lists as keys but tell the user not to modify them. This would +allow a class of hard-to-track bugs in programs that I'd rather not see; +it invalidates an important invariant of dictionaries (every value in +d.keys() is usable as a key of the dictionary). +

+- Mark lists as read-only once they are used as a dictionary key. +The problem is that it's not just the top-level object that could change +its value; you could use a tuple containing a list as a key. Entering +anything as a key into a dictionary would require marking all objects +reachable from there as read-only -- and again, self-referential objects +could cause an infinite loop again (and again and again). +

+There is a trick to get around this if you need to, but +use it at your own risk: You +can wrap a mutable structure inside a class instance which +has both a __cmp__ and a __hash__ method. +

+

+   class listwrapper:
+        def __init__(self, the_list):
+              self.the_list = the_list
+        def __cmp__(self, other):
+              return self.the_list == other.the_list
+        def __hash__(self):
+              l = self.the_list
+              result = 98767 - len(l)*555
+              for i in range(len(l)):
+                   try:
+                        result = result + (hash(l[i]) % 9999999) * 1001 + i
+                   except:
+                        result = (result % 7777777) + i * 333
+              return result
+

+Note that the hash computation is complicated by the +possibility that some members of the list may be unhashable +and also by the possibility of arithmetic overflow. +

+You must make +sure that the hash value for all such wrapper objects that reside in a +dictionary (or other hash based structure), remain fixed while +the object is in the dictionary (or other structure). +

+Furthermore it must always be the case that if +o1 == o2 (ie o1.__cmp__(o2)==0) then hash(o1)==hash(o2) +(ie, o1.__hash__() == o2.__hash__()), regardless of whether +the object is in a dictionary or not. +If you fail to meet these restrictions dictionaries and other +hash based structures may misbehave! +

+In the case of listwrapper above whenever the wrapper +object is in a dictionary the wrapped list must not change +to avoid anomalies. Don't do this unless you are prepared +to think hard about the requirements and the consequences +of not meeting them correctly. You've been warned! +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 10 10:08:40 1997 by +aaron watters +

+ +

+

6.19. How the heck do you make an array in Python?

+["this", 1, "is", "an", "array"] +

+Lists are arrays in the C or Pascal sense of the word (see question +6.16). The array module also provides methods for creating arrays +of fixed types with compact representations (but they are slower to +index than lists). Also note that the Numerics extensions and others +define array-like structures with various characteristics as well. +

+To get Lisp-like lists, emulate cons cells +

+

+    lisp_list = ("like",  ("this",  ("example", None) ) )
+

+using tuples (or lists, if you want mutability). Here the analogue +of lisp car is lisp_list[0] and the analogue of cdr is lisp_list[1]. +Only do this if you're sure you really need to (it's usually a lot +slower than using Python lists). +

+Think of Python lists as mutable heterogeneous arrays of +Python objects (say that 10 times fast :) ). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:08:27 1997 by +aaron watters +

+ +

+

6.20. Why doesn't list.sort() return the sorted list?

+In situations where performance matters, making a copy of the list +just to sort it would be wasteful. Therefore, list.sort() sorts +the list in place. In order to remind you of that fact, it does +not return the sorted list. This way, you won't be fooled into +accidentally overwriting a list when you need a sorted copy but also +need to keep the unsorted version around. +

+As a result, here's the idiom to iterate over the keys of a dictionary +in sorted order: +

+

+	keys = dict.keys()
+	keys.sort()
+	for key in keys:
+		...do whatever with dict[key]...
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Dec 2 17:01:52 1999 by +Fred L. Drake, Jr. +

+ +

+

6.21. How do you specify and enforce an interface spec in Python?

+An interfaces specification for a module as provided +by languages such as C++ and java describes the prototypes +for the methods and functions of the module. Many feel +that compile time enforcement of interface specifications +help aid in the construction of large programs. Python +does not support interface specifications directly, but many +of their advantages can be obtained by an appropriate +test discipline for components, which can often be very +easily accomplished in Python. There is also a tool, PyChecker, +which can be used to find problems due to subclassing. +

+A good test suite for a module can at +once provide a regression test and serve as a module interface +specification (even better since it also gives example usage). Look to +many of the standard libraries which often have a "script +interpretation" which provides a simple "self test." Even +modules which use complex external interfaces can often +be tested in isolation using trivial "stub" emulations of the +external interface. +

+An appropriate testing discipline (if enforced) can help +build large complex applications in Python as well as having interface +specifications would do (or better). Of course Python allows you +to get sloppy and not do it. Also you might want to design +your code with an eye to make it easily tested. +

+ +Edit this entry / +Log info + +/ Last changed on Thu May 23 03:05:29 2002 by +Neal Norwitz +

+ +

+

6.22. Why do all classes have the same type? Why do instances all have the same type?

+The Pythonic use of the word "type" is quite different from +common usage in much of the rest of the programming language +world. A "type" in Python is a description for an object's operations +as implemented in C. All classes have the same operations +implemented in C which sometimes "call back" to differing program +fragments implemented in Python, and hence all classes have the +same type. Similarly at the C level all class instances have the +same C implementation, and hence all instances have the same +type. +

+Remember that in Python usage "type" refers to a C implementation +of an object. To distinguish among instances of different classes +use Instance.__class__, and also look to 4.47. Sorry for the +terminological confusion, but at this point in Python's development +nothing can be done! +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jul 1 12:35:47 1997 by +aaron watters +

+ +

+

6.23. Why isn't all memory freed when Python exits?

+Objects referenced from Python module global name spaces are +not always deallocated when Python exits. +

+This may happen if there are circular references (see question +4.17). There are also certain bits of memory that are allocated +by the C library that are impossible to free (e.g. a tool +like Purify will complain about these). +

+But in general, Python 1.5 and beyond +(in contrast with earlier versions) is quite agressive about +cleaning up memory on exit. +

+If you want to force Python to delete certain things on deallocation +use the sys.exitfunc hook to force those deletions. For example +if you are debugging an extension module using a memory analysis +tool and you wish to make Python deallocate almost everything +you might use an exitfunc like this one: +

+

+  import sys
+

+

+  def my_exitfunc():
+       print "cleaning up"
+       import sys
+       # do order dependant deletions here
+       ...
+       # now delete everything else in arbitrary order
+       for x in sys.modules.values():
+            d = x.__dict__
+            for name in d.keys():
+                 del d[name]
+

+

+  sys.exitfunc = my_exitfunc
+

+Other exitfuncs can be less drastic, of course. +

+(In fact, this one just does what Python now already does itself; +but the example of using sys.exitfunc to force cleanups is still +useful.) +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 29 09:46:26 1998 by +GvR +

+ +

+

6.24. Why no class methods or mutable class variables?

+The notation +

+

+    instance.attribute(arg1, arg2)
+

+usually translates to the equivalent of +

+

+    Class.attribute(instance, arg1, arg2)
+

+where Class is a (super)class of instance. Similarly +

+

+    instance.attribute = value
+

+sets an attribute of an instance (overriding any attribute of a class +that instance inherits). +

+Sometimes programmers want to have +different behaviours -- they want a method which does not bind +to the instance and a class attribute which changes in place. +Python does not preclude these behaviours, but you have to +adopt a convention to implement them. One way to accomplish +this is to use "list wrappers" and global functions. +

+

+   def C_hello():
+         print "hello"
+

+

+   class C:
+        hello = [C_hello]
+        counter = [0]
+

+

+    I = C()
+

+Here I.hello[0]() acts very much like a "class method" and +I.counter[0] = 2 alters C.counter (and doesn't override it). +If you don't understand why you'd ever want to do this, that's +because you are pure of mind, and you probably never will +want to do it! This is dangerous trickery, not recommended +when avoidable. (Inspired by Tim Peter's discussion.) +

+In Python 2.2, you can do this using the new built-in operations +classmethod and staticmethod. +See http://www.python.org/2.2/descrintro.html#staticmethods +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 11 15:59:37 2001 by +GvR +

+ +

+

6.25. Why are default values sometimes shared between objects?

+It is often expected that a function CALL creates new objects for default +values. This is not what happens. Default values are created when the +function is DEFINED, that is, there is only one such object that all +functions refer to. If that object is changed, subsequent calls to the +function will refer to this changed object. By definition, immutable objects +(like numbers, strings, tuples, None) are safe from change. Changes to mutable +objects (like dictionaries, lists, class instances) is what causes the +confusion. +

+Because of this feature it is good programming practice not to use mutable +objects as default values, but to introduce them in the function. +Don't write: +

+

+	def foo(dict={}):  # XXX shared reference to one dict for all calls
+	    ...
+

+but: +

+	def foo(dict=None):
+		if dict is None:
+			dict = {} # create a new dict for local namespace
+

+See page 182 of "Internet Programming with Python" for one discussion +of this feature. Or see the top of page 144 or bottom of page 277 in +"Programming Python" for another discussion. +

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 16 07:03:35 1997 by +Case Roole +

+ +

+

6.26. Why no goto?

+Actually, you can use exceptions to provide a "structured goto" +that even works across function calls. Many feel that exceptions +can conveniently emulate all reasonable uses of the "go" or "goto" +constructs of C, Fortran, and other languages. For example: +

+

+   class label: pass # declare a label
+   try:
+        ...
+        if (condition): raise label() # goto label
+        ...
+   except label: # where to goto
+        pass
+   ...
+

+This doesn't allow you to jump into the middle of a loop, but +that's usually considered an abuse of goto anyway. Use sparingly. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Sep 10 07:16:44 1997 by +aaron watters +

+ +

+

6.27. How do you make a higher order function in Python?

+You have two choices: you can use default arguments and override +them or you can use "callable objects." For example suppose you +wanted to define linear(a,b) which returns a function f where f(x) +computes the value a*x+b. Using default arguments: +

+

+     def linear(a,b):
+         def result(x, a=a, b=b):
+             return a*x + b
+         return result
+

+Or using callable objects: +

+

+     class linear:
+        def __init__(self, a, b):
+            self.a, self.b = a,b
+        def __call__(self, x):
+            return self.a * x + self.b
+

+In both cases: +

+

+     taxes = linear(0.3,2)
+

+gives a callable object where taxes(10e6) == 0.3 * 10e6 + 2. +

+The defaults strategy has the disadvantage that the default arguments +could be accidentally or maliciously overridden. The callable objects +approach has the disadvantage that it is a bit slower and a bit +longer. Note however that a collection of callables can share +their signature via inheritance. EG +

+

+      class exponential(linear):
+         # __init__ inherited
+         def __call__(self, x):
+             return self.a * (x ** self.b)
+

+On comp.lang.python, zenin@bawdycaste.org points out that +an object can encapsulate state for several methods in order +to emulate the "closure" concept from functional programming +languages, for example: +

+

+    class counter:
+        value = 0
+        def set(self, x): self.value = x
+        def up(self): self.value=self.value+1
+        def down(self): self.value=self.value-1
+

+

+    count = counter()
+    inc, dec, reset = count.up, count.down, count.set
+

+Here inc, dec and reset act like "functions which share the +same closure containing the variable count.value" (if you +like that way of thinking). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Sep 25 08:38:35 1998 by +Aaron Watters +

+ +

+

6.28. Why do I get a SyntaxError for a 'continue' inside a 'try'?

+This is an implementation limitation, +caused by the extremely simple-minded +way Python generates bytecode. The try block pushes something on the +"block stack" which the continue would have to pop off again. The +current code generator doesn't have the data structures around so that +'continue' can generate the right code. +

+Note that JPython doesn't have this restriction! +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 22 15:01:07 1998 by +GvR +

+ +

+

6.29. Why can't raw strings (r-strings) end with a backslash?

+More precisely, they can't end with an odd number of backslashes: +the unpaired backslash at the end escapes the closing quote character, +leaving an unterminated string. +

+Raw strings were designed to ease creating input for processors (chiefly +regular expression engines) that want to do their own backslash escape processing. Such processors consider an unmatched trailing backslash to be an error anyway, so raw strings disallow that. In return, they allow you to pass on the string quote character by escaping it with a backslash. These rules work well when r-strings are used for their intended purpose. +

+If you're trying to build Windows pathnames, note that all Windows system calls accept forward slashes too: +

+

+    f = open("/mydir/file.txt") # works fine!
+

+If you're trying to build a pathname for a DOS command, try e.g. one of +

+

+    dir = r"\this\is\my\dos\dir" "\\"
+    dir = r"\this\is\my\dos\dir\ "[:-1]
+    dir = "\\this\\is\\my\\dos\\dir\\"
+

+

+ +Edit this entry / +Log info + +/ Last changed on Mon Jul 13 20:50:20 1998 by +Tim Peters +

+ +

+

6.30. Why can't I use an assignment in an expression?

+Many people used to C or Perl complain that they want to be able to +use e.g. this C idiom: +

+

+    while (line = readline(f)) {
+        ...do something with line...
+    }
+

+where in Python you're forced to write this: +

+

+    while 1:
+        line = f.readline()
+        if not line:
+            break
+        ...do something with line...
+

+This issue comes up in the Python newsgroup with alarming frequency +-- search Deja News for past messages about assignment expression. +The reason for not allowing assignment in Python expressions +is a common, hard-to-find bug in those other languages, +caused by this construct: +

+

+    if (x = 0) {
+        ...error handling...
+    }
+    else {
+        ...code that only works for nonzero x...
+    }
+

+Many alternatives have been proposed. Most are hacks that save some +typing but use arbitrary or cryptic syntax or keywords, +and fail the simple criterion that I use for language change proposals: +it should intuitively suggest the proper meaning to a human reader +who has not yet been introduced with the construct. +

+The earliest time something can be done about this will be with +Python 2.0 -- if it is decided that it is worth fixing. +An interesting phenomenon is that most experienced Python programmers +recognize the "while 1" idiom and don't seem to be missing the +assignment in expression construct much; it's only the newcomers +who express a strong desire to add this to the language. +

+One fairly elegant solution would be to introduce a new operator +for assignment in expressions spelled ":=" -- this avoids the "=" +instead of "==" problem. It would have the same precedence +as comparison operators but the parser would flag combination with +other comparisons (without disambiguating parentheses) as an error. +

+Finally -- there's an alternative way of spelling this that seems +attractive but is generally less robust than the "while 1" solution: +

+

+    line = f.readline()
+    while line:
+        ...do something with line...
+        line = f.readline()
+

+The problem with this is that if you change your mind about exactly +how you get the next line (e.g. you want to change it into +sys.stdin.readline()) you have to remember to change two places +in your program -- the second one hidden at the bottom of the loop. +

+ +Edit this entry / +Log info + +/ Last changed on Tue May 18 00:57:41 1999 by +Andrew Dalke +

+ +

+

6.31. Why doesn't Python have a "with" statement like some other languages?

+Basically, because such a construct would be terribly ambiguous. Thanks to Carlos Ribeiro for the following remarks: +

+Some languages, such as Object Pascal, Delphi, and C++, use static types. So it is possible to know, in an unambiguous way, what member is being assigned in a "with" clause. This is the main point - the compiler always knows the scope of every variable at compile time. +

+Python uses dynamic types. It is impossible to know in advance which +attribute will be referenced at runtime. Member attributes may be added or removed from objects on the fly. This would make it impossible to know, from a simple reading, what attribute is being referenced - a local one, a global one, or a member attribute. +

+For instance, take the following snippet (it is incomplete btw, just to +give you the idea): +

+

+   def with_is_broken(a):
+      with a:
+         print x
+

+The snippet assumes that "a" must have a member attribute called "x". +However, there is nothing in Python that guarantees that. What should +happen if "a" is, let us say, an integer? And if I have a global variable named "x", will it end up being used inside the with block? As you see, the dynamic nature of Python makes such choices much harder. +

+The primary benefit of "with" and similar language features (reduction of code volume) can, however, easily be achieved in Python by assignment. Instead of: +

+

+    function(args).dict[index][index].a = 21
+    function(args).dict[index][index].b = 42
+    function(args).dict[index][index].c = 63
+

+would become: +

+

+    ref = function(args).dict[index][index]
+    ref.a = 21
+    ref.b = 42
+    ref.c = 63
+

+This also has the happy side-effect of increasing execution speed, since name bindings are resolved at run-time in Python, and the second method only needs to perform the resolution once. If the referenced object does not have a, b and c attributes, of course, the end result is still a run-time exception. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jan 11 14:32:58 2002 by +Steve Holden +

+ +

+

6.32. Why are colons required for if/while/def/class?

+The colon is required primarily to enhance readability (one of the +results of the experimental ABC language). Consider this: +

+

+    if a==b
+        print a
+

+versus +

+

+    if a==b:
+        print a
+

+Notice how the second one is slightly easier to read. Notice further how +a colon sets off the example in the second line of this FAQ answer; it's +a standard usage in English. Finally, the colon makes it easier for +editors with syntax highlighting. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Jun 3 07:22:57 2002 by +Matthias Urlichs +

+ +

+

6.33. Can't we get rid of the Global Interpreter Lock?

+The Global Interpreter Lock (GIL) is often seen as a hindrance to +Python's deployment on high-end multiprocessor server machines, +because a multi-threaded Python program effectively only uses +one CPU, due to the insistence that (almost) all Python code +can only run while the GIL is held. +

+Back in the days of Python 1.5, Greg Stein actually implemented +a comprehensive patch set ("free threading") +that removed the GIL, replacing it with +fine-grained locking. Unfortunately, even on Windows (where locks +are very efficient) this ran ordinary Python code about twice as +slow as the interpreter using the GIL. On Linux the performance +loss was even worse (pthread locks aren't as efficient). +

+Since then, the idea of getting rid of the GIL has occasionally +come up but nobody has found a way to deal with the expected slowdown; +Greg's free threading patch set has not been kept up-to-date for +later Python versions. +

+This doesn't mean that you can't make good use of Python on +multi-CPU machines! You just have to be creative with dividing +the work up between multiple processes rather than multiple +threads. +

+

+It has been suggested that the GIL should be a per-interpreter-state +lock rather than truly global; interpreters then wouldn't be able +to share objects. Unfortunately, this isn't likely to happen either. +

+It would be a tremendous amount of work, because many object +implementations currently have global state. E.g. small ints and +small strings are cached; these caches would have to be moved to the +interpreter state. Other object types have their own free list; these +free lists would have to be moved to the interpreter state. And so +on. +

+And I doubt that it can even be done in finite time, because the same +problem exists for 3rd party extensions. It is likely that 3rd party +extensions are being written at a faster rate than you can convert +them to store all their global state in the interpreter state. +

+And finally, once you have multiple interpreters not sharing any +state, what have you gained over running each interpreter +in a separate process? +

+ +Edit this entry / +Log info + +/ Last changed on Fri Feb 7 16:34:01 2003 by +GvR +

+ +

+

7. Using Python on non-UNIX platforms

+ +

+

7.1. Is there a Mac version of Python?

+Yes, it is maintained by Jack Jansen. See Jack's MacPython Page: +

+

+  http://www.cwi.nl/~jack/macpython.html
+

+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 4 09:33:42 2001 by +GvR +

+ +

+

7.2. Are there DOS and Windows versions of Python?

+Yes. The core windows binaries are available from http://www.python.org/windows/. There is a plethora of Windows extensions available, including a large number of not-always-compatible GUI toolkits. The core binaries include the standard Tkinter GUI extension. +

+Most windows extensions can be found (or referenced) at http://www.python.org/windows/ +

+Windows 3.1/DOS support seems to have dropped off recently. You may need to settle for an old version of Python one these platforms. One such port is WPY +

+WPY: Ports to DOS, Windows 3.1(1), Windows 95, Windows NT and OS/2. +Also contains a GUI package that offers portability between Windows +(not DOS) and Unix, and native look and feel on both. +ftp://ftp.python.org/pub/python/wpy/. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Jun 2 20:21:57 1998 by +Mark Hammond +

+ +

+

7.3. Is there an OS/2 version of Python?

+Yes, see http://www.python.org/download/download_os2.html. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Sep 7 11:33:16 1999 by +GvR +

+ +

+

7.4. Is there a VMS version of Python?

+Jean-Fran�ois Pi�ronne has ported 2.1.3 to OpenVMS. It can be found at +<http://vmspython.dyndns.org/>. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Sep 19 15:40:38 2002 by +Skip Montanaro +

+ +

+

7.5. What about IBM mainframes, or other non-UNIX platforms?

+I haven't heard about these, except I remember hearing about an +OS/9 port and a port to Vxworks (both operating systems for embedded +systems). If you're interested in any of this, go directly to the +newsgroup and ask there, you may find exactly what you need. For +example, a port to MPE/iX 5.0 on HP3000 computers was just announced, +see http://www.allegro.com/software/. +

+On the IBM mainframe side, for Z/OS there's a port of python 1.4 that goes with their open-unix package, formely OpenEdition MVS, (http://www-1.ibm.com/servers/eserver/zseries/zos/unix/python.html). On a side note, there's also a java vm ported - so, in theory, jython could run too. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Nov 18 03:18:39 2002 by +Bruno Jessen +

+ +

+

7.6. Where are the source or Makefiles for the non-UNIX versions?

+The standard sources can (almost) be used. Additional sources can +be found in the platform-specific subdirectories of the distribution. +

+ +Edit this entry / +Log info +

+ +

+

7.7. What is the status and support for the non-UNIX versions?

+I don't have access to most of these platforms, so in general I am +dependent on material submitted by volunteers. However I strive to +integrate all changes needed to get it to compile on a particular +platform back into the standard sources, so porting of the next +version to the various non-UNIX platforms should be easy. +(Note that Linux is classified as a UNIX platform here. :-) +

+Some specific platforms: +

+Windows: all versions (95, 98, ME, NT, 2000, XP) are supported, +all python.org releases come with a Windows installer. +

+MacOS: Jack Jansen does an admirable job of keeping the Mac version +up to date (both MacOS X and older versions); +see http://www.cwi.nl/~jack/macpython.html +

+For all supported platforms, see http://www.python.org/download/ +(follow the link to "Other platforms" for less common platforms) +

+ +Edit this entry / +Log info + +/ Last changed on Fri May 24 21:34:24 2002 by +GvR +

+ +

+

7.8. I have a PC version but it appears to be only a binary. Where's the library?

+If you are running any version of Windows, then you have the wrong distribution. The FAQ lists current Windows versions. Notably, Pythonwin and wpy provide fully functional installations. +

+But if you are sure you have the only distribution with a hope of working on +your system, then... +

+You still need to copy the files from the distribution directory +"python/Lib" to your system. If you don't have the full distribution, +you can get the file lib<version>.tar.gz from most ftp sites carrying +Python; this is a subset of the distribution containing just those +files, e.g. ftp://ftp.python.org/pub/python/src/lib1.4.tar.gz. +

+Once you have installed the library, you need to point sys.path to it. +Assuming the library is in C:\misc\python\lib, the following commands +will point your Python interpreter to it (note the doubled backslashes +-- you can also use single forward slashes instead): +

+

+        >>> import sys
+        >>> sys.path.insert(0, 'C:\\misc\\python\\lib')
+        >>>
+

+For a more permanent effect, set the environment variable PYTHONPATH, +as follows (talking to a DOS prompt): +

+

+        C> SET PYTHONPATH=C:\misc\python\lib
+

+

+ +Edit this entry / +Log info + +/ Last changed on Fri May 23 16:28:27 1997 by +Ken Manheimer +

+ +

+

7.9. Where's the documentation for the Mac or PC version?

+The documentation for the Unix version also applies to the Mac and +PC versions. Where applicable, differences are indicated in the text. +

+ +Edit this entry / +Log info +

+ +

+

7.10. How do I create a Python program file on the Mac or PC?

+Use an external editor. On the Mac, BBEdit seems to be a popular +no-frills text editor. I work like this: start the interpreter; edit +a module file using BBedit; import and test it in the interpreter; +edit again in BBedit; then use the built-in function reload() to +re-read the imported module; etc. In the 1.4 distribution +you will find a BBEdit extension that makes life a little easier: +it can tell the interpreter to execute the current window. +See :Mac:Tools:BBPy:README. +

+Regarding the same question for the PC, Kurt Wm. Hemr writes: "While +anyone with a pulse could certainly figure out how to do the same on +MS-Windows, I would recommend the NotGNU Emacs clone for MS-Windows. +Not only can you easily resave and "reload()" from Python after making +changes, but since WinNot auto-copies to the clipboard any text you +select, you can simply select the entire procedure (function) which +you changed in WinNot, switch to QWPython, and shift-ins to reenter +the changed program unit." +

+If you're using Windows95 or Windows NT, you should also know about +PythonWin, which provides a GUI framework, with an mouse-driven +editor, an object browser, and a GUI-based debugger. See +

+       http://www.python.org/ftp/python/pythonwin/
+

+for details. +

+ +Edit this entry / +Log info + +/ Last changed on Sun May 25 10:04:25 1997 by +GvR +

+ +

+

7.11. How can I use Tkinter on Windows 95/NT?

+Starting from Python 1.5, it's very easy -- just download and install +Python and Tcl/Tk and you're in business. See +

+

+  http://www.python.org/download/download_windows.html
+

+One warning: don't attempt to use Tkinter from PythonWin +(Mark Hammond's IDE). Use it from the command line interface +(python.exe) or the windowless interpreter (pythonw.exe). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 12 09:32:48 1998 by +GvR +

+ +

+

7.12. cgi.py (or other CGI programming) doesn't work sometimes on NT or win95!

+Be sure you have the latest python.exe, that you are using +python.exe rather than a GUI version of python and that you +have configured the server to execute +

+

+     "...\python.exe -u ..."
+

+for the cgi execution. The -u (unbuffered) option on NT and +win95 prevents the interpreter from altering newlines in the +standard input and output. Without it post/multipart requests +will seem to have the wrong length and binary (eg, GIF) +responses may get garbled (resulting in, eg, a "broken image"). +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jul 30 10:48:02 1997 by +aaron watters +

+ +

+

7.13. Why doesn't os.popen() work in PythonWin on NT?

+The reason that os.popen() doesn't work from within PythonWin is due to a bug in Microsoft's C Runtime Library (CRT). The CRT assumes you have a Win32 console attached to the process. +

+You should use the win32pipe module's popen() instead which doesn't depend on having an attached Win32 console. +

+Example: +

+ import win32pipe
+ f = win32pipe.popen('dir /c c:\\')
+ print f.readlines()
+ f.close()
+

+

+ +Edit this entry / +Log info + +/ Last changed on Thu Jul 31 15:34:09 1997 by +Bill Tutt +

+ +

+

7.14. How do I use different functionality on different platforms with the same program?

+Remember that Python is extremely dynamic and that you +can use this dynamism to configure a program at run-time to +use available functionality on different platforms. For example +you can test the sys.platform and import different modules based +on its value. +

+

+   import sys
+   if sys.platform == "win32":
+      import win32pipe
+      popen = win32pipe.popen
+   else:
+      import os
+      popen = os.popen
+

+(See FAQ 7.13 for an explanation of why you might want to +do something like this.) Also you can try to import a module +and use a fallback if the import fails: +

+

+    try:
+         import really_fast_implementation
+         choice = really_fast_implementation
+    except ImportError:
+         import slower_implementation
+         choice = slower_implementation
+

+

+ +Edit this entry / +Log info + +/ Last changed on Wed Aug 13 07:39:06 1997 by +aaron watters +

+ +

+

7.15. Is there an Amiga version of Python?

+Yes. See the AmigaPython homepage at http://www.bigfoot.com/~irmen/python.html. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Dec 14 06:53:32 1998 by +Irmen de Jong +

+ +

+

7.16. Why doesn't os.popen()/win32pipe.popen() work on Win9x?

+There is a bug in Win9x that prevents os.popen/win32pipe.popen* from working. The good news is there is a way to work around this problem. +The Microsoft Knowledge Base article that you need to lookup is: Q150956. You will find links to the knowledge base at: +http://www.microsoft.com/kb. +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 25 10:45:38 1999 by +Bill Tutt +

+ +

+

8. Python on Windows

+ +

+

8.1. Using Python for CGI on Microsoft Windows

+** Setting up the Microsoft IIS Server/Peer Server +

+On the Microsoft IIS +server or on the Win95 MS Personal Web Server +you set up python in the same way that you +would set up any other scripting engine. +

+Run regedt32 and go to: +

+HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\W3SVC\Parameters\ScriptMap +

+and enter the following line (making any specific changes that your system may need) +

+.py :REG_SZ: c:\<path to python>\python.exe -u %s %s +

+This line will allow you to call your script with a simple reference like: +http://yourserver/scripts/yourscript.py +provided "scripts" is an "executable" directory for your server (which +it usually is by default). +The "-u" flag specifies unbuffered and binary mode for stdin - needed when working with binary data +

+In addition, it is recommended by people who would know that using ".py" may +not be a good idea for the file extensions when used in this context +(you might want to reserve *.py for support modules and use *.cgi or *.cgp +for "main program" scripts). +However, that issue is beyond this Windows FAQ entry. +

+

+** Apache configuration +

+In the Apache configuration file httpd.conf, add the following line at +the end of the file: +

+ScriptInterpreterSource Registry +

+Then, give your Python CGI-scripts the extension .py and put them in the cgi-bin directory. +

+

+** Netscape Servers: +Information on this topic exists at: +http://home.netscape.com/comprod/server_central/support/fasttrack_man/programs.htm#1010870 +

+ +Edit this entry / +Log info + +/ Last changed on Wed Mar 27 12:25:54 2002 by +Gerhard H�ring +

+ +

+

8.2. How to check for a keypress without blocking?

+Use the msvcrt module. This is a standard Windows-specific extensions +in Python 1.5 and beyond. It defines a function kbhit() which checks +whether a keyboard hit is present; also getch() which gets one +character without echo. Plus a few other goodies. +

+(Search for "keypress" to find an answer for Unix as well.) +

+ +Edit this entry / +Log info + +/ Last changed on Mon Mar 30 16:21:46 1998 by +GvR +

+ +

+

8.3. $PYTHONPATH

+In MS-DOS derived environments, a unix variable such as $PYTHONPATH is +set as PYTHONPATH, without the dollar sign. PYTHONPATH is useful for +specifying the location of library files. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jun 11 00:41:26 1998 by +Gvr +

+ +

+

8.4. dedent syntax errors

+The FAQ does not recommend using tabs, and Guido's Python Style Guide recommends 4 spaces for distributed Python code; this is also the Emacs python-mode default; see +

+

+    http://www.python.org/doc/essays/styleguide.html
+

+Under any editor mixing tabs and spaces is a bad idea. MSVC is no different in this respect, and is easily configured to use spaces: Take Tools -> Options -> Tabs, and for file type "Default" set "Tab size" and "Indent size" to 4, and select the "Insert spaces" radio button. +

+If you suspect mixed tabs and spaces are causing problems in leading whitespace, run Python with the -t switch or, run Tools/Scripts/tabnanny.py to check a directory tree in batch mode. +

+ +Edit this entry / +Log info + +/ Last changed on Mon Feb 12 15:04:14 2001 by +Steve Holden +

+ +

+

8.5. How do I emulate os.kill() in Windows?

+Use win32api: +

+

+    def kill(pid):
+        """kill function for Win32"""
+        import win32api
+        handle = win32api.OpenProcess(1, 0, pid)
+        return (0 != win32api.TerminateProcess(handle, 0))
+

+

+ +Edit this entry / +Log info + +/ Last changed on Sat Aug 8 18:55:06 1998 by +Jeff Bauer +

+ +

+

8.6. Why does os.path.isdir() fail on NT shared directories?

+The solution appears to be always append the "\\" on +the end of shared drives. +

+

+  >>> import os
+  >>> os.path.isdir( '\\\\rorschach\\public')
+  0
+  >>> os.path.isdir( '\\\\rorschach\\public\\')
+  1
+

+[Blake Winton responds:] +I've had the same problem doing "Start >> Run" and then a +directory on a shared drive. If I use "\\rorschach\public", +it will fail, but if I use "\\rorschach\public\", it will +work. For that matter, os.stat() does the same thing (well, +it gives an error for "\\\\rorschach\\public", but you get +the idea)... +

+I've got a theory about why this happens, but it's only +a theory. NT knows the difference between shared directories, +and regular directories. "\\rorschach\public" isn't a +directory, it's _really_ an IPC abstraction. This is sort +of lended credence to by the fact that when you're mapping +a network drive, you can't map "\\rorschach\public\utils", +but only "\\rorschach\public". +

+[Clarification by funkster@midwinter.com] +It's not actually a Python +question, as Python is working just fine; it's clearing up something +a bit muddled about Windows networked drives. +

+It helps to think of share points as being like drive letters. +Example: +

+        k: is not a directory
+        k:\ is a directory
+        k:\media is a directory
+        k:\media\ is not a directory
+

+The same rules apply if you substitute "k:" with "\\conky\foo": +

+        \\conky\foo  is not a directory
+        \\conky\foo\ is a directory
+        \\conky\foo\media is a directory
+        \\conky\foo\media\ is not a directory
+

+

+ +Edit this entry / +Log info + +/ Last changed on Sun Jan 31 08:44:48 1999 by +GvR +

+ +

+

8.7. PyRun_SimpleFile() crashes on Windows but not on Unix

+I've seen a number of reports of PyRun_SimpleFile() failing +in a Windows port of an application embedding Python that worked +fine on Unix. PyRun_SimpleString() works fine on both platforms. +

+I think this happens because the application was compiled with a +different set of compiler flags than Python15.DLL. It seems that some +compiler flags affect the standard I/O library in such a way that +using different flags makes calls fail. You need to set it for +the non-debug multi-threaded DLL (/MD on the command line, or can be set via MSVC under Project Settings->C++/Code Generation then the "Use rum-time library" dropdown.) +

+Also note that you can not mix-and-match Debug and Release versions. If you wish to use the Debug Multithreaded DLL, then your module _must_ have an "_d" appended to the base name. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Nov 17 17:37:07 1999 by +Mark Hammond +

+ +

+

8.8. Import of _tkinter fails on Windows 95/98

+Sometimes, the import of _tkinter fails on Windows 95 or 98, +complaining with a message like the following: +

+

+  ImportError: DLL load failed: One of the library files needed
+  to run this application cannot be found.
+

+It could be that you haven't installed Tcl/Tk, but if you did +install Tcl/Tk, and the Wish application works correctly, +the problem may be that its installer didn't +manage to edit the autoexec.bat file correctly. It tries to add a +statement that changes the PATH environment variable to include +the Tcl/Tk 'bin' subdirectory, but sometimes this edit doesn't +quite work. Opening it with notepad usually reveals what the +problem is. +

+(One additional hint, noted by David Szafranski: you can't use +long filenames here; e.g. use C:\PROGRA~1\Tcl\bin instead of +C:\Program Files\Tcl\bin.) +

+ +Edit this entry / +Log info + +/ Last changed on Wed Dec 2 22:32:41 1998 by +GvR +

+ +

+

8.9. Can't extract the downloaded documentation on Windows

+Sometimes, when you download the documentation package to a Windows +machine using a web browser, the file extension of the saved file +ends up being .EXE. This is a mistake; the extension should be .TGZ. +

+Simply rename the downloaded file to have the .TGZ extension, and +WinZip will be able to handle it. (If your copy of WinZip doesn't, +get a newer one from http://www.winzip.com.) +

+ +Edit this entry / +Log info + +/ Last changed on Sat Nov 21 13:41:35 1998 by +GvR +

+ +

+

8.10. Can't get Py_RunSimpleFile() to work.

+This is very sensitive to the compiler vendor, version and (perhaps) +even options. If the FILE* structure in your embedding program isn't +the same as is assumed by the Python interpreter it won't work. +

+The Python 1.5.* DLLs (python15.dll) are all compiled +with MS VC++ 5.0 and with multithreading-DLL options (/MD, I think). +

+If you can't change compilers or flags, try using Py_RunSimpleString(). +A trick to get it to run an arbitrary file is to construct a call to +execfile() with the name of your file as argument. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Jan 13 10:58:14 1999 by +GvR +

+ +

+

8.11. Where is Freeze for Windows?

+("Freeze" is a program that allows you to ship a Python program +as a single stand-alone executable file. It is not a compiler, +your programs don't run any faster, but they are more easily +distributable (to platforms with the same OS and CPU). Read the +README file of the freeze program for more disclaimers.) +

+You can use freeze on Windows, but you must download the source +tree (see http://www.python.org/download/download_source.html). +This is recommended for Python 1.5.2 (and betas thereof) only; +older versions don't quite work. +

+You need the Microsoft VC++ 5.0 compiler (maybe it works with +6.0 too). You probably need to build Python -- the project files +are all in the PCbuild directory. +

+The freeze program is in the Tools\freeze subdirectory of the source +tree. +

+ +Edit this entry / +Log info + +/ Last changed on Wed Feb 17 18:47:24 1999 by +GvR +

+ +

+

8.12. Is a *.pyd file the same as a DLL?

+Yes, .pyd files are dll's. But there are a few differences. If you +have a DLL named foo.pyd, then it must have a function initfoo(). You +can then write Python "import foo", and Python will search for foo.pyd +(as well as foo.py, foo.pyc) and if it finds it, will attempt to call +initfoo() to initialize it. You do not link your .exe with foo.lib, +as that would cause Windows to require the DLL to be present. +

+Note that the search path for foo.pyd is PYTHONPATH, not the same as +the path that Windows uses to search for foo.dll. Also, foo.pyd need +not be present to run your program, whereas if you linked your program +with a dll, the dll is required. Of course, foo.pyd is required if +you want to say "import foo". In a dll, linkage is declared in the +source code with __declspec(dllexport). In a .pyd, linkage is defined +in a list of available functions. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 23 02:40:08 1999 by +Jameson Quinn +

+ +

+

8.13. Missing cw3215mt.dll (or missing cw3215.dll)

+Sometimes, when using Tkinter on Windows, you get an error that +cw3215mt.dll or cw3215.dll is missing. +

+Cause: you have an old Tcl/Tk DLL built with cygwin in your path +(probably C:\Windows). You must use the Tcl/Tk DLLs from the +standard Tcl/Tk installation (Python 1.5.2 comes with one). +

+ +Edit this entry / +Log info + +/ Last changed on Fri Jun 11 00:54:13 1999 by +GvR +

+ +

+

8.14. How to make python scripts executable:

+[Blake Coverett] +

+Win2K: +

+The standard installer already associates the .py extension with a file type +(Python.File) and gives that file type an open command that runs the +interpreter (D:\Program Files\Python\python.exe "%1" %*). This is enough to +make scripts executable from the command prompt as 'foo.py'. If you'd +rather be able to execute the script by simple typing 'foo' with no +extension you need to add .py to the PATHEXT environment variable. +

+WinNT: +

+The steps taken by the installed as described above allow you do run a +script with 'foo.py', but a long time bug in the NT command processor +prevents you from redirecting the input or output of any script executed in +this way. This is often important. +

+An appropriate incantation for making a Python script executable under WinNT +is to give the file an extension of .cmd and add the following as the first +line: +

+

+    @setlocal enableextensions & python -x %~f0 %* & goto :EOF
+

+Win9x: +

+[Due to Bruce Eckel] +

+

+  @echo off
+  rem = """
+  rem run python on this bat file. Needs the full path where
+  rem you keep your python files. The -x causes python to skip
+  rem the first line of the file:
+  python -x c:\aaa\Python\\"%0".bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+  goto endofpython
+  rem """
+

+

+  # The python program goes here:
+

+

+  print "hello, Python"
+

+

+  # For the end of the batch file:
+  rem = """
+  :endofpython
+  rem """
+

+

+ +Edit this entry / +Log info + +/ Last changed on Tue Nov 30 10:25:17 1999 by +GvR +

+ +

+

8.15. Warning about CTL3D32 version from installer

+The Python installer issues a warning like this: +

+

+  This version uses CTL3D32.DLL whitch is not the correct version.
+  This version is used for windows NT applications only.
+

+[Tim Peters] +This is a Microsoft DLL, and a notorious +source of problems. The msg means what it says: you have the wrong version +of this DLL for your operating system. The Python installation did not +cause this -- something else you installed previous to this overwrote the +DLL that came with your OS (probably older shareware of some sort, but +there's no way to tell now). If you search for "CTL3D32" using any search +engine (AltaVista, for example), you'll find hundreds and hundreds of web +pages complaining about the same problem with all sorts of installation +programs. They'll point you to ways to get the correct version reinstalled +on your system (since Python doesn't cause this, we can't fix it). +

+David A Burton has written a little program to fix this. Go to +http://www.burtonsys.com/download.html and click on "ctl3dfix.zip" +

+ +Edit this entry / +Log info + +/ Last changed on Thu Oct 26 15:42:00 2000 by +GvR +

+ +

+

8.16. How can I embed Python into a Windows application?

+Edward K. Ream <edream@tds.net> writes +

+When '##' appears in a file name below, it is an abbreviated version number. For example, for Python 2.1.1, ## will be replaced by 21. +

+Embedding the Python interpreter in a Windows app can be summarized as +follows: +

+1. Do _not_ build Python into your .exe file directly. On Windows, +Python must be a DLL to handle importing modules that are themselves +DLL's. (This is the first key undocumented fact.) Instead, link to +python##.dll; it is typically installed in c:\Windows\System. +

+You can link to Python statically or dynamically. Linking statically +means linking against python##.lib The drawback is that your app won't +run if python##.dll does not exist on your system. +

+General note: python##.lib is the so-called "import lib" corresponding +to python.dll. It merely defines symbols for the linker. +

+Borland note: convert python##.lib to OMF format using Coff2Omf.exe +first. +

+Linking dynamically greatly simplifies link options; everything happens +at run time. Your code must load python##.dll using the Windows +LoadLibraryEx() routine. The code must also use access routines and +data in python##.dll (that is, Python's C API's) using pointers +obtained by the Windows GetProcAddress() routine. Macros can make +using these pointers transparent to any C code that calls routines in +Python's C API. +

+2. If you use SWIG, it is easy to create a Python "extension module" +that will make the app's data and methods available to Python. SWIG +will handle just about all the grungy details for you. The result is C +code that you link _into your .exe file_ (!) You do _not_ have to +create a DLL file, and this also simplifies linking. +

+3. SWIG will create an init function (a C function) whose name depends +on the name of the extension module. For example, if the name of the +module is leo, the init function will be called initleo(). If you use +SWIG shadow classes, as you should, the init function will be called +initleoc(). This initializes a mostly hidden helper class used by the +shadow class. +

+The reason you can link the C code in step 2 into your .exe file is that +calling the initialization function is equivalent to importing the +module into Python! (This is the second key undocumented fact.) +

+4. In short, you can use the following code to initialize the Python +interpreter with your extension module. +

+

+    #include "python.h"
+    ...
+    Py_Initialize();  // Initialize Python.
+    initmyAppc();  // Initialize (import) the helper class. 
+    PyRun_SimpleString("import myApp") ;  // Import the shadow class.
+

+5. There are two problems with Python's C API which will become apparent +if you use a compiler other than MSVC, the compiler used to build +python##.dll. +

+Problem 1: The so-called "Very High Level" functions that take FILE * +arguments will not work in a multi-compiler environment; each compiler's +notion of a struct FILE will be different. From an implementation +standpoint these are very _low_ level functions. +

+Problem 2: SWIG generates the following code when generating wrappers to +void functions: +

+

+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+

+Alas, Py_None is a macro that expands to a reference to a complex data +structure called _Py_NoneStruct inside python##.dll. Again, this code +will fail in a mult-compiler environment. Replace such code by: +

+

+    return Py_BuildValue("");
+

+It may be possible to use SWIG's %typemap command to make the change +automatically, though I have not been able to get this to work (I'm a +complete SWIG newbie). +

+6. Using a Python shell script to put up a Python interpreter window +from inside your Windows app is not a good idea; the resulting window +will be independent of your app's windowing system. Rather, you (or the +wxPythonWindow class) should create a "native" interpreter window. It +is easy to connect that window to the Python interpreter. You can +redirect Python's i/o to _any_ object that supports read and write, so +all you need is a Python object (defined in your extension module) that +contains read() and write() methods. +

+ +Edit this entry / +Log info + +/ Last changed on Thu Jan 31 16:29:34 2002 by +Victor Kryukov +

+ +

+

8.17. Setting up IIS 5 to use Python for CGI

+In order to set up Internet Information Services 5 to use Python for CGI processing, please see the following links: +

+http://www.e-coli.net/pyiis_server.html (for Win2k Server) +http://www.e-coli.net/pyiis.html (for Win2k pro) +

+ +Edit this entry / +Log info + +/ Last changed on Fri Mar 22 22:05:51 2002 by +douglas savitsky +

+ +

+

8.18. How do I run a Python program under Windows?

+This is not necessarily quite the straightforward question it appears +to be. If you are already familiar with running programs from the +Windows command line then everything will seem really easy and +obvious. If your computer experience is limited then you might need a +little more guidance. Also there are differences between Windows 95, +98, NT, ME, 2000 and XP which can add to the confusion. You might +think of this as "why I pay software support charges" if you have a +helpful and friendly administrator to help you set things up without +having to understand all this yourself. If so, then great! Show them +this page and it should be a done deal. +

+Unless you use some sort of integrated development environment (such +as PythonWin or IDLE, to name only two in a growing family) then you +will end up typing Windows commands into what is variously referred +to as a "DOS window" or "Command prompt window". Usually you can +create such a window from your Start menu (under Windows 2000 I use +"Start | Programs | Accessories | Command Prompt"). You should be +able to recognize when you have started such a window because you will +see a Windows "command prompt", which usually looks like this: +

+

+    C:\>
+

+The letter may be different, and there might be other things after it, +so you might just as easily see something like: +

+

+    D:\Steve\Projects\Python>
+

+depending on how your computer has been set up and what else you have +recently done with it. Once you have started such a window, you are +well on the way to running Python programs. +

+You need to realize that your Python scripts have to be processed by +another program, usually called the "Python interpreter". The +interpreter reads your script, "compiles" it into "Python bytecodes" +(which are instructions for an imaginary computer known as the "Python +Virtual Machine") and then executes the bytecodes to run your +program. So, how do you arrange for the interpreter to handle your +Python? +

+First, you need to make sure that your command window recognises the +word "python" as an instruction to start the interpreter. If you have +opened a command window, you should try entering the command: +

+

+    python
+

+and hitting return. If you then see something like: +

+

+    Python 2.2 (#28, Dec 21 2001, 12:21:22) [MSC 32 bit (Intel)] on win32
+    Type "help", "copyright", "credits" or "license" for more information.
+    >>>
+

+then this part of the job has been correctly managed during Python's +installation process, and you have started the interpreter in +"interactive mode". That means you can enter Python statements or +expressions interactively and have them executed or evaluated while +you wait. This is one of Python's strongest features, but it takes a +little getting used to. Check it by entering a few expressions of your +choice and seeing the results... +

+

+    >>> print "Hello"
+    Hello
+    >>> "Hello" * 3
+    HelloHelloHello
+

+When you want to end your interactive Python session, enter a +terminator (hold the Ctrl key down while you enter a Z, then hit the +"Enter" key) to get back to your Windows command prompt. You may also +find that you have a Start-menu entry such as "Start | Programs | +Python 2.2 | Python (command line)" that results in you seeing the +">>>" prompt in a new window. If so, the window will disappear after +you enter the terminator -- Windows runs a single "python" command in +the window, which terminates when you terminate the interpreter. +

+If the "python" command, instead of displaying the interpreter prompt ">>>", gives you a message like +

+

+    'python' is not recognized as an internal or external command,
+    operable program or batch file.
+

+or +

+

+    Bad command or filename
+

+then you need to make sure that your computer knows where to find the +Python interpreter. To do this you will have to modify a setting +called the PATH, which is a just list of directories where Windows +will look for programs. Rather than just enter the right command every +time you create a command window, you should arrange for Python's +installation directory to be added to the PATH of every command window +as it starts. If you installed Python fairly recently then the command +

+

+    dir C:\py*
+

+will probably tell you where it is installed. Alternatively, perhaps +you made a note. Otherwise you will be reduced to a search of your +whole disk ... break out the Windows explorer and use "Tools | Find" +or hit the "Search" button and look for "python.exe". Suppose you +discover that Python is installed in the C:\Python22 directory (the +default at the time of writing) then you should make sure that +entering the command +

+

+    c:\Python22\python
+

+starts up the interpreter as above (and don't forget you'll need a +"CTRL-Z" and an "Enter" to get out of it). Once you have verified the +directory, you need to add it to the start-up routines your computer +goes through. For older versions of Windows the easiest way to do +this is to edit the C:\AUTOEXEC.BAT file. You would want to add a line +like the following to AUTOEXEC.BAT: +

+

+    PATH C:\Python22;%PATH%
+

+For Windows NT, 2000 and (I assume) XP, you will need to add a string +such as +

+

+    ;C:\Python22
+

+to the current setting for the PATH environment variable, which you +will find in the properties window of "My Computer" under the +"Advanced" tab. Note that if you have sufficient privilege you might +get a choice of installing the settings either for the Current User or +for System. The latter is preferred if you want everybody to be able +to run Python on the machine. +

+If you aren't confident doing any of these manipulations yourself, ask +for help! At this stage you may or may not want to reboot your system +to make absolutely sure the new setting has "taken" (don't you love +the way Windows gives you these freqeuent coffee breaks). You probably +won't need to for Windows NT, XP or 2000. You can also avoid it in +earlier versions by editing the file C:\WINDOWS\COMMAND\CMDINIT.BAT +instead of AUTOEXEC.BAT. +

+You should now be able to start a new command window, enter +

+

+    python
+

+at the "C:>" (or whatever) prompt, and see the ">>>" prompt that +indicates the Python interpreter is reading interactive commands. +

+Let's suppose you have a program called "pytest.py" in directory +"C:\Steve\Projects\Python". A session to run that program might look +like this: +

+

+    C:\> cd \Steve\Projects\Python
+    C:\Steve\Projects\Python> python pytest.py
+

+Because you added a file name to the command to start the interpreter, +when it starts up it reads the Python script in the named file, +compiles it, executes it, and terminates (so you see another "C:\>" +prompt). You might also have entered +

+

+    C:\> python \Steve\Projects\Python\pytest.py
+

+if you hadn't wanted to change your current directory. +

+Under NT, 2000 and XP you may well find that the installation process +has also arranged that the command +

+

+    pytest.py
+

+(or, if the file isn't in the current directory) +

+

+    C:\Steve\Projects\Python\pytest.py
+

+will automatically recognize the ".py" extension and run the Python +interpreter on the named file. Using this feature is fine, but some +versions of Windows have bugs which mean that this form isn't exactly +equivalent to using the interpreter explicitly, so be careful. Easier +to remember, for now, that +

+

+    python C:\Steve\Projects\Python\pytest.py
+

+works pretty close to the same, and redirection will work (more) +reliably. +

+The important things to remember are: +

+1. Start Python from the Start Menu, or make sure the PATH is set +correctly so Windows can find the Python interpreter. +

+

+    python
+

+should give you a '>>>" prompt from the Python interpreter. Don't +forget the CTRL-Z and ENTER to terminate the interpreter (and, if you +started the window from the Start Menu, make the window disappear). +

+2. Once this works, you run programs with commands: +

+

+    python {program-file}
+

+3. When you know the commands to use you can build Windows shortcuts +to run the Python interpreter on any of your scripts, naming +particular working directories, and adding them to your menus, but +that's another lessFAQ. Take a look at +

+

+    python --help
+

+if your needs are complex. +

+4. Interactive mode (where you see the ">>>" prompt) is best used +not for running programs, which are better executed as in steps 2 +and 3, but for checking that individual statements and expressions do +what you think they will, and for developing code by experiment. +

+ +Edit this entry / +Log info + +/ Last changed on Tue Aug 20 16:19:53 2002 by +GvR +

+ +

+Python home / +Python FAQ Wizard 1.0.3 / +Feedback to GvR +

+ + --- python2.7-2.7.12.orig/debian/PVER-dbg.README.Debian.in +++ python2.7-2.7.12/debian/PVER-dbg.README.Debian.in @@ -0,0 +1,58 @@ +Contents of the @PVER@-dbg package +------------------------------------- + +For debugging python and extension modules, you may want to add the contents +of /usr/share/doc/@PVER@/gdbinit (found in the @PVER@-dev package) to your +~/.gdbinit file. + +@PVER@-dbg contains two sets of packages: + + - debugging symbols for the standard @PVER@ build. When this package + is installed, gdb will automatically load up the debugging symbols + from it when debugging @PVER@ or one of the included extension + modules. + + - a separate @PVER@-dbg binary, configured --with-pydebug, enabling the + additional debugging code to help debug memory management problems. + +For the latter, all extension modules have to be recompiled to +correctly load with an pydebug enabled build. + + +Debian and Ubuntu specific changes to the debug interpreter +----------------------------------------------------------- +The python2.4 and python2.5 packages in Ubuntu feisty are modified to +first look for extension modules under a different name. + + normal build: foo.so + debug build: foo_d.so foo.so + +This naming schema allows installation of the extension modules into +the same path (The naming is directly taken from the Windows builds +which already uses this naming scheme). + +See https://wiki.ubuntu.com/PyDbgBuilds for more information. + + +Using the python-dbg builds +--------------------------- + + * Call the python-dbg or the pythonX.Y-dbg binaries instead of the + python or pythonX.Y binaries. + + * Debugging a third party extension requires the availabilty of the + extension built for the debug interpreter. For an extension `foo' + make sure that the `python-foo-dbg' package is installed, or else + the interpreter falls back to the extension for the normal build. + The error on fallback is expected. + + * Properties of the debug build are described in + /usr/share/doc/@PVER@/SpecialBuilds.txt.gz. + The debug interpreter is built with Py_DEBUG defined. + + * From SpecialBuilds.txt: This is what is generally meant by "a debug + build" of Python. Py_DEBUG implies LLTRACE, Py_REF_DEBUG, + Py_TRACE_REFS, and PYMALLOC_DEBUG (if WITH_PYMALLOC is enabled). + In addition, C assert()s are enabled (via the C way: by not defining + NDEBUG), and some routines do additional sanity checks inside + "#ifdef Py_DEBUG" blocks. --- python2.7-2.7.12.orig/debian/PVER-dbg.overrides.in +++ python2.7-2.7.12/debian/PVER-dbg.overrides.in @@ -0,0 +1,11 @@ +@PVER@-dbg binary: package-name-doesnt-match-sonames +@PVER@-dbg binary: non-dev-pkg-with-shlib-symlink + +# no, it's not unusual +@PVER@-dbg binary: unusual-interpreter + +# just the gdb debug file +@PVER@-dbg binary: python-script-but-no-python-dep + +# pointless lintian ... +@PVER@-dbg binary: hardening-no-fortify-functions --- python2.7-2.7.12.orig/debian/PVER-dbg.postinst.in +++ python2.7-2.7.12/debian/PVER-dbg.postinst.in @@ -0,0 +1,19 @@ +#! /bin/sh + +set -e + +if [ "$1" = configure ]; then + files=$(dpkg -L lib@PVER@-dbg@HOST_QUAL@ | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p') + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@-dbg: can't get files for byte-compilation" + fi +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/PVER-dbg.prerm.in +++ python2.7-2.7.12/debian/PVER-dbg.prerm.in @@ -0,0 +1,28 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + rm -f /usr/lib/debug/usr/bin/@PVER@-gdb.py[co] + rm -f /usr/lib/debug/usr/lib/lib@PVER@.so.1.0-gdb.py[co] + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + upgrade) + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-api.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-api.in @@ -0,0 +1,13 @@ +Document: @PVER@-api +Title: Python/C API Reference Manual (v@VER@) +Author: Guido van Rossum +Abstract: This manual documents the API used by C (or C++) programmers who + want to write extension modules or embed Python. It is a + companion to *Extending and Embedding the Python Interpreter*, + which describes the general principles of extension writing but + does not document the API functions in detail. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/c-api/index.html +Files: /usr/share/doc/@PVER@/html/c-api/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-dist.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-dist.in @@ -0,0 +1,13 @@ +Document: @PVER@-dist +Title: Distributing Python Modules (v@VER@) +Author: Greg Ward +Abstract: This document describes the Python Distribution Utilities + (``Distutils'') from the module developer's point-of-view, describing + how to use the Distutils to make Python modules and extensions easily + available to a wider audience with very little overhead for + build/release/install mechanics. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/distutils/index.html +Files: /usr/share/doc/@PVER@/html/distutils/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-ext.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-ext.in @@ -0,0 +1,16 @@ +Document: @PVER@-ext +Title: Extending and Embedding the Python Interpreter (v@VER@) +Author: Guido van Rossum +Abstract: This document describes how to write modules in C or C++ to extend + the Python interpreter with new modules. Those modules can define + new functions but also new object types and their methods. The + document also describes how to embed the Python interpreter in + another application, for use as an extension language. Finally, + it shows how to compile and link extension modules so that they + can be loaded dynamically (at run time) into the interpreter, if + the underlying operating system supports this feature. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/extending/index.html +Files: /usr/share/doc/@PVER@/html/extending/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-inst.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-inst.in @@ -0,0 +1,12 @@ +Document: @PVER@-inst +Title: Installing Python Modules (v@VER@) +Author: Greg Ward +Abstract: This document describes the Python Distribution Utilities + (``Distutils'') from the end-user's point-of-view, describing how to + extend the capabilities of a standard Python installation by building + and installing third-party Python modules and extensions. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/install/index.html +Files: /usr/share/doc/@PVER@/html/install/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-lib.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-lib.in @@ -0,0 +1,15 @@ +Document: @PVER@-lib +Title: Python Library Reference (v@VER@) +Author: Guido van Rossum +Abstract: This library reference manual documents Python's standard library, + as well as many optional library modules (which may or may not be + available, depending on whether the underlying platform supports + them and on the configuration choices made at compile time). It + also documents the standard types of the language and its built-in + functions and exceptions, many of which are not or incompletely + documented in the Reference Manual. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/library/index.html +Files: /usr/share/doc/@PVER@/html/library/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-new.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-new.in @@ -0,0 +1,10 @@ +Document: @PVER@-new +Title: What's new in Python @VER@ +Author: A.M. Kuchling +Abstract: This documents lists new features and changes worth mentioning + in Python @VER@. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html +Files: /usr/share/doc/@PVER@/html/whatsnew/@VER@.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-ref.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-ref.in @@ -0,0 +1,18 @@ +Document: @PVER@-ref +Title: Python Reference Manual (v@VER@) +Author: Guido van Rossum +Abstract: This reference manual describes the syntax and "core semantics" of + the language. It is terse, but attempts to be exact and complete. + The semantics of non-essential built-in object types and of the + built-in functions and modules are described in the *Python + Library Reference*. For an informal introduction to the language, + see the *Python Tutorial*. For C or C++ programmers, two + additional manuals exist: *Extending and Embedding the Python + Interpreter* describes the high-level picture of how to write a + Python extension module, and the *Python/C API Reference Manual* + describes the interfaces available to C/C++ programmers in detail. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/reference/index.html +Files: /usr/share/doc/@PVER@/html/reference/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.doc-base.PVER-tut.in +++ python2.7-2.7.12/debian/PVER-doc.doc-base.PVER-tut.in @@ -0,0 +1,13 @@ +Document: @PVER@-tut +Title: Python Tutorial (v@VER@) +Author: Guido van Rossum, Fred L. Drake, Jr., editor +Abstract: This tutorial introduces the reader informally to the basic + concepts and features of the Python language and system. It helps + to have a Python interpreter handy for hands-on experience, but + all examples are self-contained, so the tutorial can be read + off-line as well. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/@PVER@/html/tutorial/index.html +Files: /usr/share/doc/@PVER@/html/tutorial/*.html --- python2.7-2.7.12.orig/debian/PVER-doc.overrides.in +++ python2.7-2.7.12/debian/PVER-doc.overrides.in @@ -0,0 +1,2 @@ +# this is referenced by the html docs +@PVER@-doc binary: extra-license-file --- python2.7-2.7.12.orig/debian/PVER-examples.overrides.in +++ python2.7-2.7.12/debian/PVER-examples.overrides.in @@ -0,0 +1,2 @@ +# don't care about permissions of the example files +@PVER@-examples binary: executable-not-elf-or-script --- python2.7-2.7.12.orig/debian/PVER-minimal.README.Debian.in +++ python2.7-2.7.12/debian/PVER-minimal.README.Debian.in @@ -0,0 +1,157 @@ +Contents of the @PVER@-minimal package +----------------------------------------- + +@PVER@-minimal consists of a minimum set of modules which may be needed +for python scripts used during the boot process. If other packages +are needed in these scripts, don't work around the missing module, but +file a bug report against this package. The modules in this package +are: + + __builtin__ builtin + __future__ module + _abcoll module + _bisect extension + _bytesio extension + _codecs builtin + _collections extension + _fileio extension + _functools extension + _hashlib extensionx + _heapq extension + _io extension + _locale extension + _md5 extension + _random extension + _sha extension + _sha256 extension + _sha512 extension + _socket extension + _sre builtin + _ssl extensionx + _struct extension + _symtable builtin + _sysconfigdata module + _types builtin + _warnings builtin + _weakref extension + _weakrefset module + abc module + atexit module + ConfigParser module + StringIO module + UserDict module + cPickle extension + cStringIO extension + array extension + base64 module + binascii extension + bisect module + cmath extension + calendar module + codecs module + collections module + compileall module + contextlib module + copy module + copy_reg module + datetime extension + dis module + encodings package + errno builtin + exceptions builtin + fcntl extension + fnmatch module + functools module + gc builtin + genericpath module + getopt module + glob module + grp extension + hashlib module + heapq module + imp builtin + inspect module + io module + itertools extension + keyword module + linecache module + locale module + logging package + marshal builtin + math extension + md5 module + opcode module + operator extension + optparse module + os module + pickle module + platform module + popen2 module + posix builtin + posixpath module + pkgutil module + pwd builtin + py_compile module + random module + re module + repr module + runpy module + select extension + sha module + shutil module + signal builtin + socket module + spwd extension + sre module + sre_compile module + sre_constants module + sre_parse module + ssl module + stat module + string module + strop extension + struct module + subprocess module + sys builtin + syslog extension + sysconfig module + tempfile module + textwrap module + time extension + token module + thread builtin + token module + tokenize module + traceback module + types module + unicodedata extension + weakref module + warnings module + zipimport extension + zlib extension + +Included are as well the codecs and stringprep modules, and the encodings +modules for all encodings except the multibyte encodings and the bz2 codec. + +The following modules are excluded, their import is guarded from the +importing module: + + Used in Excluded + ------------ ------------------------------------ + os nt ntpath os2 os2emxpath mac macpath + riscos riscospath riscosenviron + optparse gettext + pickle doctest + subprocess threading + +This list was derived by looking at the modules in the perl-base package, +then adding python specific "core modules". + +TODO's +------ + +- time.strptime cannot be used. The required _strptime module is not + included in the -minimal package yet. _strptime, locale, _locale and + calendar have to be added. + +- modules used very often in the testsuite: copy, cPickle, operator. --- python2.7-2.7.12.orig/debian/PVER-minimal.postinst.in +++ python2.7-2.7.12/debian/PVER-minimal.postinst.in @@ -0,0 +1,78 @@ +#! /bin/sh + +set -e + +if [ ! -f /etc/@PVER@/sitecustomize.py ]; then + cat <<-EOF + # Empty sitecustomize.py to avoid a dangling symlink +EOF +fi + +case "$1" in + configure) + # Create empty directories in /usr/local + if [ ! -e /usr/local/lib/@PVER@ ]; then + mkdir -p /usr/local/lib/@PVER@ 2> /dev/null || true + chmod 2775 /usr/local/lib/@PVER@ 2> /dev/null || true + chown root:staff /usr/local/lib/@PVER@ 2> /dev/null || true + fi + localsite=/usr/local/lib/@PVER@/dist-packages + if [ ! -e $localsite ]; then + mkdir -p $localsite 2> /dev/null || true + chmod 2775 $localsite 2> /dev/null || true + chown root:staff $localsite 2> /dev/null || true + fi + + if which update-binfmts >/dev/null; then + update-binfmts --import @PVER@ + fi + + ;; +esac + +if [ "$1" = configure ]; then + if ls -L /usr/lib/@PVER@/sitecustomize.py >/dev/null 2>&1; then + filt='cat' + else + filt='fgrep -v sitecustomize.py' + fi + files=$(dpkg -L lib@PVER@-minimal@HOST_QUAL@ \ + | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p' | $filt) + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@-minimal: can't get files for byte-compilation" + fi + bc=no + if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.7-9 \ + || [ -f /var/lib/python/@PVER@_installed ]; then + bc=yes + fi + if grep -sq '^unsupported-versions[^#]*@PVER@' /usr/share/python/debian_defaults + then + # FIXME: byte compile anyway? + bc=no + fi + if [ "$bc" = yes ]; then + # new installation or installation of first version with hook support + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Linking and byte-compiling packages for runtime @PVER@..." + fi + version=$(dpkg -s @PVER@-minimal | awk '/^Version:/ {print $2}') + for hook in /usr/share/python/runtime.d/*.rtinstall; do + [ -x $hook ] || continue + $hook rtinstall @PVER@ "$2" "$version" + done + if [ -f /var/lib/python/@PVER@_installed ]; then + rm -f /var/lib/python/@PVER@_installed + rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null + fi + fi +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/PVER-minimal.postrm.in +++ python2.7-2.7.12/debian/PVER-minimal.postrm.in @@ -0,0 +1,21 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + + if [ -f /var/lib/python/@PVER@_installed ]; then + rm -f /var/lib/python/@PVER@_installed + rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null + fi +fi + +if [ "$1" = "purge" ]; then + for d in `find /usr/lib/@PVER@ -depth -type d -empty 2> /dev/null`; do \ + while rmdir $d 2> /dev/null; do d=`dirname $d`; done; \ + done +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/PVER-minimal.preinst.in +++ python2.7-2.7.12/debian/PVER-minimal.preinst.in @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +syssite=/usr/lib/@PVER@/site-packages +oldsite=/usr/lib/@PVER@/old-site-packages +localsite=/usr/local/lib/@PVER@/dist-packages +syslink=../../${localsite#/usr/*} + +case "$1" in + install) + if [ -z "$2" ] && [ -d $syssite ] && [ ! -h $syssite ]; then + echo "new installation of @PVER@-minimal; $syssite is a directory" + echo "which is expected a symlink to $localsite." + echo "please find the package shipping files in $syssite and" + echo "file a bug report to ship these in /usr/lib/@PVER@/dist-packages instead" + echo "aborting installation of @PVER@-minimal" + exit 1 + fi + + # remember newly installed runtime + mkdir -p /var/lib/python + touch /var/lib/python/@PVER@_installed + ;; + upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/PVER-minimal.prerm.in +++ python2.7-2.7.12/debian/PVER-minimal.prerm.in @@ -0,0 +1,36 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + if [ "$DEBIAN_FRONTEND" != noninteractive ]; then + echo "Unlinking and removing bytecode for runtime @PVER@" + fi + for hook in /usr/share/python/runtime.d/*.rtremove; do + [ -x $hook ] || continue + $hook rtremove @PVER@ || continue + done + + if which update-binfmts >/dev/null; then + update-binfmts --package @PVER@ --remove @PVER@ /usr/bin/@PVER@ + fi + + localsite=/usr/local/lib/@PVER@/dist-packages + [ -d $localsite ] && rmdir $localsite 2>/dev/null || true + [ -d $(dirname $localsite) ] \ + && rmdir $(dirname $localsite) 2>/dev/null || true + ;; + upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/PVER.desktop.in +++ python2.7-2.7.12/debian/PVER.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Python (v@VER@) +Comment=Python Interpreter (v@VER@) +Exec=/usr/bin/@PVER@ +Icon=/usr/share/pixmaps/@PVER@.xpm +Terminal=true +Type=Application +Categories=Development; +StartupNotify=true +NoDisplay=true --- python2.7-2.7.12.orig/debian/PVER.overrides.in +++ python2.7-2.7.12/debian/PVER.overrides.in @@ -0,0 +1,14 @@ +# idlelib images +@PVER@ binary: image-file-in-usr-lib + +# yes, we have to +@PVER@ binary: depends-on-python-minimal + +@PVER@ binary: desktop-command-not-in-package +@PVER@ binary: menu-command-not-in-package + +# license file referred by the standard library +@PVER@ binary: extra-license-file + +# no, not useless +@PVER@ binary: manpage-has-useless-whatis-entry --- python2.7-2.7.12.orig/debian/PVER.postinst.in +++ python2.7-2.7.12/debian/PVER.postinst.in @@ -0,0 +1,41 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + files=$(dpkg -L lib@PVER@-stdlib@HOST_QUAL@ | sed -n '/^\/usr\/lib\/@PVER@\/.*\.py$/p') + if [ -n "$files" ]; then + @PVER@ -E -S /usr/lib/@PVER@/py_compile.py $files + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config; then + @PVER@ -E -S -O /usr/lib/@PVER@/py_compile.py $files + fi + else + echo >&2 "@PVER@: can't get files for byte-compilation" + fi + + # Create empty directories in /usr/local + if [ ! -e /usr/local/lib/python@VER@ ]; then + mkdir -p /usr/local/lib/python@VER@ 2> /dev/null || true + chmod 2775 /usr/local/lib/python@VER@ 2> /dev/null || true + chown root:staff /usr/local/lib/python@VER@ 2> /dev/null || true + fi + if [ ! -e /usr/local/lib/python@VER@/site-packages ]; then + mkdir -p /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + chmod 2775 /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + chown root:staff /usr/local/lib/python@VER@/site-packages 2> /dev/null || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/PVER.prerm.in +++ python2.7-2.7.12/debian/PVER.prerm.in @@ -0,0 +1,22 @@ +#! /bin/sh + +set -e + +case "$1" in + remove|upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +rmdir /usr/local/lib/python@VER@/site-packages 2>/dev/null && \ + rmdir /usr/local/lib/python@VER@ 2>/dev/null || \ + true + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/PVER.pycentral.in +++ python2.7-2.7.12/debian/PVER.pycentral.in @@ -0,0 +1,4 @@ +[@PVER@] +runtime: @PVER@ +interpreter: /usr/bin/@PVER@ +prefix: /usr/lib/@PVER@ --- python2.7-2.7.12.orig/debian/README.Debian.in +++ python2.7-2.7.12/debian/README.Debian.in @@ -0,0 +1,8 @@ +The documentation for this package is in /usr/share/doc/@PVER@/. + +A draft of the "Debian Python Policy" can be found in + + /usr/share/doc/python + +Sometime it will be moved to /usr/share/doc/debian-policy in the +debian-policy package. --- python2.7-2.7.12.orig/debian/README.PVER.in +++ python2.7-2.7.12/debian/README.PVER.in @@ -0,0 +1,95 @@ + + Python @VER@ for Debian + --------------------- + +This is Python @VER@ packaged for Debian. + +This document contains information specific to the Debian packages of +Python @VER@. + + + + [TODO: This document is not yet up-to-date with the packages.] + +Currently, it features those two main topics: + + 1. Release notes for the Debian packages: + 2. Notes for developers using the Debian Python packages: + +Release notes and documentation from the upstream package are installed +in /usr/share/doc/@PVER@/. + +There's a mailing list for discussion of issues related to Python on Debian +systems: debian-python@lists.debian.org. The list is not intended for +general Python problems, but as a forum for maintainers of Python-related +packages and interested third parties. + + + +1. Release notes for the Debian packages: + + +Results of the regression test: +------------------------------ + +The package does successfully run the regression tests for all included +modules. Seven packages are skipped since they are platform-dependent and +can't be used with Linux. + + +2. Notes for developers using the Debian python packages: + +See the draft of the Debian Python policy in /usr/share/doc/python. + +distutils can be found in the @PVER@-dev package. Development files +like the python library or Makefiles can be found in the @PVER@-dev +package in /usr/lib/@PVER@/config. Therefore, if you need to install +a pure python extension, you only need @PVER@. On the other hand, to +install a C extension, you need @PVER@-dev. + +a) Locally installed Python add-ons + + /usr/local/lib/@PVER@/site-packages/ + /usr/local/lib/site-python/ (version-independent modules) + +b) Python add-ons packaged for Debian + + /usr/lib/@PVER@/site-packages/ + /usr/lib/site-python/ (version-independent modules) + +Note that no package must install files directly into /usr/lib/@PVER@/ +or /usr/local/lib/@PVER@/. Only the site-packages directory is allowed +for third-party extensions. + +Use of the new `package' scheme is strongly encouraged. The `ni' interface +is obsolete in python 1.5. + +Header files for extensions go into /usr/include/@PVER@/. + + +Installing extensions for local use only: +---------------------------------------- + +Consider using distutils ... + +Most extensions use Python's Makefile.pre.in. Note that Makefile.pre.in +by default will install files into /usr/lib/, not into /usr/local/lib/, +which is not allowed for local extensions. You'll have to change the +Makefile accordingly. Most times, "make prefix=/usr/local install" will +work. + + +Packaging python extensions for Debian: +-------------------------------------- + +Maintainers of Python extension packages should read + + /usr/share/doc/python/python-policy.txt.gz + + + + + 03/09/98 + Gregor Hoffleit + +Last change: 2001-12-14 --- python2.7-2.7.12.orig/debian/README.Tk +++ python2.7-2.7.12/debian/README.Tk @@ -0,0 +1,8 @@ +Tkinter documentation can be found at + + http://www.pythonware.com/library/index.htm + +more specific: + + http://www.pythonware.com/library/tkinter/introduction/index.htm + http://www.pythonware.com/library/tkinter/an-introduction-to-tkinter.pdf --- python2.7-2.7.12.orig/debian/README.dbm +++ python2.7-2.7.12/debian/README.dbm @@ -0,0 +1,72 @@ + + Python and dbm modules on Debian + -------------------------------- + +This file documents the configuration of the dbm modules for Debian. It +gives hints at the preferred use of the dbm modules. + + +The preferred way to access dbm databases in Python is the anydbm module. +dbm databases behave like mappings (dictionaries). + +Since there exist several dbm database formats, we choose the following +layout for Python on Debian: + + * creating a new database with anydbm will create a Berkeley DB 2.X Hash + database file. This is the standard format used by libdb starting + with glibc 2.1. + + * opening an existing database with anydbm will try to guess the format + of the file (using whichdb) and then load it using one of the bsddb, + bsddb1, gdbm or dbm (only if the python-gdbm package is installed) + or dumbdbm modules. + + * The modules use the following database formats: + + - bsddb: Berkeley DB 2.X Hash (as in libc6 >=2.1 or libdb2) + - bsddb1: Berkeley DB 1.85 Hash (as in libc6 >=2.1 or libdb2) + - gdbm: GNU dbm 1.x or ndbm + - dbm: " (nearly the same as the gdbm module for us) + - dumbdbm: a hand-crafted format only used in this module + + That means that all usual formats should be readable with anydbm. + + * If you want to create a database in a format different from DB 2.X, + you can still directly use the specified module. + + * I.e. bsddb is the preferred module, and DB 2.X is the preferred format. + + * Note that the db1hash and bsddb1 modules are Debian specific. anydbm + and whichdb have been modified to support DB 2.X Hash files (see + below for details). + + + +For experts only: +---------------- + +Although bsddb employs the new DB 2.X format and uses the new Sleepycat +DB 2 library as included with glibc >= 2.1, it's still using the old +DB 1.85 API (which is still supported by DB 2). + +A more recent version 1.1 of the BSD DB module (available from +http://starship.skyport.net/robind/python/) directly uses the DB 2.X API. +It has a richer set of features. + + +On a glibc 2.1 system, bsddb is linked with -ldb, bsddb1 is linked with +-ldb1 and gdbm as well as dbm are linked with -lgdbm. + +On a glibc 2.0 system (e.g. potato for m68k or slink), bsddb will be +linked with -ldb2 while bsddb1 will be linked with -ldb (therefore +python-base here depends on libdb2). + + +db1hash and bsddb1 nearly completely identical to dbhash and bsddb. The +only difference is that bsddb is linked with the real DB 2 library, while +bsddb1 is linked with an library which provides compatibility with legacy +DB 1.85 databases. + + + July 16, 1999 + Gregor Hoffleit --- python2.7-2.7.12.orig/debian/README.idle-PVER.in +++ python2.7-2.7.12/debian/README.idle-PVER.in @@ -0,0 +1,14 @@ + + The Python IDLE package for Debian + ---------------------------------- + +This package contains Python @VER@'s Integrated DeveLopment Environment, IDLE. + +IDLE is included in the Python @VER@ upstream distribution (Tools/idle) and +depends on Tkinter (available as @PVER@-tk package). + +I have written a simple man page. + + + 06/16/1999 + Gregor Hoffleit --- python2.7-2.7.12.orig/debian/README.maintainers.in +++ python2.7-2.7.12/debian/README.maintainers.in @@ -0,0 +1,88 @@ + +Hints for maintainers of Debian packages of Python extensions +------------------------------------------------------------- + +Most of the content of this README can be found in the Debian Python policy. +See /usr/share/doc/python/python-policy.txt.gz. + +Documentation Tools +------------------- + +If your package ships documentation produced in the Python +documentation format, you can generate it at build-time by +build-depending on @PVER@-dev, and you will find the +templates, tools and scripts in /usr/lib/@PVER@/doc/tools -- +adjust your build scripts accordingly. + + +Makefile.pre.in issues +---------------------- + +Python comes with a `universal Unix Makefile for Python extensions' in +/usr/lib/@PVER@/config/Makefile.pre.in (with Debian, this is included +in the python-dev package), which is used by most Python extensions. + +In general, packages using the Makefile.pre.in approach can be packaged +simply by running dh_make or by using one of debhelper's rules' templates +(see /usr/doc/debhelper/examples/). Makefile.pre.in works fine with e.g. +"make prefix=debian/tmp/usr install". + +One glitch: You may be running into the problem that Makefile.pre.in +doesn't try to create all the directories when they don't exist. Therefore, +you may have to create them manually before "make install". In most cases, +the following should work: + + ... + dh_installdirs /usr/lib/@PVER@ + $(MAKE) prefix=debian/tmp/usr install + ... + + +Byte-compilation +---------------- + +For speed reasons, Python internally compiles source files into a byte-code. +To speed up subsequent imports, it tries to save the byte-code along with +the source with an extension .pyc (resp. pyo). This will fail if the +libraries are installed in a non-writable directory, which may be the +case for /usr/lib/@PVER@/. + +Not that .pyc and .pyo files should not be relocated, since for debugging +purposes the path of the source for is hard-coded into them. + +To precompile files in batches after installation, Python has a script +compileall.py, which compiles all files in a given directory tree. The +Debian version of compileall has been enhanced to support incremental +compilation and to feature a ddir (destination dir) option. ddir is +used to compile files in debian/usr/lib/python/ when they will be +installed into /usr/lib/python/. + + +Currently, there are two ways to use compileall for Debian packages. The +first has a speed penalty, the second has a space penalty in the package. + +1.) Compiling and removing .pyc files in postinst/prerm: + + Use dh_python(1) from the debhelper packages to add commands to byte- + compile on installation and to remove the byte-compiled files on removal. + Your package has to build-depend on: debhelper (>= 4.1.67), python. + + In /usr/share/doc/@PVER@, you'll find sample.postinst and sample.prerm. + If you set the directory where the .py files are installed, these + scripts will install and remove the .pyc and .pyo files for your + package after unpacking resp. before removing the package. + +2.) Compiling the .pyc files `out of place' during installation: + + As of 1.5.1, compileall.py allows you to specify a faked installation + directory using the "-d destdir" option, so that you can precompile + the files in their temporary directory + (e.g. debian/tmp/usr/lib/python2.1/site-packages/PACKAGE). + + + + 11/02/98 + Gregor Hoffleit + + +Last modified: 2007-10-14 --- python2.7-2.7.12.orig/debian/README.python +++ python2.7-2.7.12/debian/README.python @@ -0,0 +1,153 @@ + + Python 2.x for Debian + --------------------- + +This is Python 2.x packaged for Debian. + +This document contains information specific to the Debian packages of +Python 2.x. + + + + [TODO: This document is not yet up-to-date with the packages.] + + + + + + +Currently, it features those two main topics: + + 1. Release notes for the Debian packages: + 2. Notes for developers using the Debian Python packages: + +Release notes and documentation from the upstream package are installed +in /usr/share/doc/python/. + +Up-to-date information regarding Python on Debian systems is also +available as http://www.debian.org/~flight/python/. + +There's a mailing list for discussion of issues related to Python on Debian +systems: debian-python@lists.debian.org. The list is not intended for +general Python problems, but as a forum for maintainers of Python-related +packages and interested third parties. + + + +1. Release notes for the Debian packages: + + +Results of the regression test: +------------------------------ + +The package does successfully run the regression tests for all included +modules. Seven packages are skipped since they are platform-dependent and +can't be used with Linux. + + +Noteworthy changes since the 1.4 packages: +----------------------------------------- + +- Threading support enabled. +- Tkinter for Tcl/Tk 8.x. +- New package python-zlib. +- The dbmmodule was dropped. Use bsddb instead. gdbmmodule is provided + for compatibility's sake. +- python-elisp adheres to the new emacs add-on policy; it now depends + on emacsen. python-elisp probably won't work correctly with emacs19. + Refer to /usr/doc/python-elisp/ for more information. +- Remember that 1.5 has dropped the `ni' interface in favor of a generic + `packages' concept. +- Python 1.5 regression test as additional package python-regrtest. You + don't need to install this package unless you don't trust the + maintainer ;-). +- once again, modified upstream's compileall.py and py_compile.py. + Now they support compilation of optimized byte-code (.pyo) for use + with "python -O", removal of .pyc and .pyo files where the .py source + files are missing (-d) and finally the fake of a installation directory + when .py files have to be compiled out of place for later installation + in a different directory (-i destdir, used in ./debian/rules). +- The Debian packages for python 1.4 do call + /usr/lib/python1.4/compileall.py in their postrm script. Therefore + I had to provide a link from /usr/lib/python1.5/compileall.py, otherwise + the old packages won't be removed completely. THIS IS A SILLY HACK! + + + +2. Notes for developers using the Debian python packages: + + +Embedding python: +---------------- + +The files for embedding python resp. extending the python interpreter +are included in the python-dev package. With the configuration in the +Debian GNU/Linux packages of python 1.5, you will want to use something +like + + -I/usr/include/python1.5 (e.g. for config.h) + -L/usr/lib/python1.5/config -lpython1.5 (... -lpthread) + (also for Makefile.pre.in, Setup etc.) + +Makefile.pre.in automatically gets that right. Note that unlike 1.4, +python 1.5 has only one library, libpython1.5.a. + +Currently, there's no shared version of libpython. Future version of +the Debian python packages will support this. + + +Python extension packages: +------------------------- + +According to www.python.org/doc/essays/packages.html, extension packages +should only install into /usr/lib/python1.5/site-packages/ (resp. +/usr/lib/site-python/ for packages that are definitely version independent). +No extension package should install files directly into /usr/lib/python1.5/. + +But according to the FSSTND, only Debian packages are allowed to use +/usr/lib/python1.5/. Therefore Debian Python additionally by default +searches a second hierarchy in /usr/local/lib/. These directories take +precedence over their equivalents in /usr/lib/. + +a) Locally installed Python add-ons + + /usr/local/lib/python1.5/site-packages/ + /usr/local/lib/site-python/ (version-independent modules) + +b) Python add-ons packaged for Debian + + /usr/lib/python1.5/site-packages/ + /usr/lib/site-python/ (version-independent modules) + +Note that no package must install files directly into /usr/lib/python1.5/ +or /usr/local/lib/python1.5/. Only the site-packages directory is allowed +for third-party extensions. + +Use of the new `package' scheme is strongly encouraged. The `ni' interface +is obsolete in python 1.5. + +Header files for extensions go into /usr/include/python1.5/. + + +Installing extensions for local use only: +---------------------------------------- + +Most extensions use Python's Makefile.pre.in. Note that Makefile.pre.in +by default will install files into /usr/lib/, not into /usr/local/lib/, +which is not allowed for local extensions. You'll have to change the +Makefile accordingly. Most times, "make prefix=/usr/local install" will +work. + + +Packaging python extensions for Debian: +-------------------------------------- + +Maintainers of Python extension packages should read README.maintainers. + + + + + 03/09/98 + Gregor Hoffleit + +Last change: 07/16/1999 --- python2.7-2.7.12.orig/debian/README.source +++ python2.7-2.7.12/debian/README.source @@ -0,0 +1,7 @@ +The source tarball is lacking the files Lib/profile.py and Lib/pstats.py, +which Debian considers to have a license non-suitable for main (the use +of these modules limited to python). + +The package uses quilt to apply / unapply patches. +See /usr/share/doc/quilt/README.source. The series file is generated +during the build. --- python2.7-2.7.12.orig/debian/_sysconfigdata.py +++ python2.7-2.7.12/debian/_sysconfigdata.py @@ -0,0 +1,6 @@ +import sys + +if hasattr(sys, 'gettotalrefcount'): + from _sysconfigdata_d import * +else: + from _sysconfigdata_nd import * --- python2.7-2.7.12.orig/debian/argparse.egg-info +++ python2.7-2.7.12/debian/argparse.egg-info @@ -0,0 +1,8 @@ +Metadata-Version: 1.0 +Name: argparse +Version: 1.2.1 +Summary: Python command-line parsing library +Author: Steven Bethard +Author-email: steven.bethard@gmail.com +License: Python Software Foundation License +Platform: any --- python2.7-2.7.12.orig/debian/changelog +++ python2.7-2.7.12/debian/changelog @@ -0,0 +1,4203 @@ +python2.7 (2.7.12-3build1) yakkety; urgency=medium + + * No-change rebuild for readline soname change. + + -- Matthias Klose Sat, 17 Sep 2016 12:08:02 +0000 + +python2.7 (2.7.12-3) unstable; urgency=medium + + * Update to 20160901 from the 2.7 branch. + - Issue #27870: A left shift of zero by a large integer no longer attempts + to allocate large amounts of memory. + - Issue #25604: Fix a minor bug in integer true division; this bug could + potentially have caused off-by-one-ulp results on platforms with + unreliable ldexp implementations. + - Issue #27861: Fixed a crash in sqlite3.Connection.cursor() when a factory + creates not a cursor. + - Issue #10513: Fix a regression in Connection.commit(). Statements should + not be reset after a commit. + - Issue #2466: posixpath.ismount now correctly recognizes mount points which + the user does not have permission to access. + - Issue #27783: Fix possible usage of uninitialized memory in + operator.methodcaller. + - Issue #27774: Fix possible Py_DECREF on unowned object in _sre. + - Issue #27760: Fix possible integer overflow in binascii.b2a_qp. + - In the curses module, raise an error if window.getstr() or window.instr() + is passed a negative value. + - Issue #27758: Fix possible integer overflow in the _csv module for large + record lengths. + - Issue #23369: Fixed possible integer overflow in + _json.encode_basestring_ascii. + - Issue #27714: text_textview and test_autocomplete now pass when re-run + in the same process. This occurs when test_idle fails when run with the + -w option but without -jn. Fix warning from test_config. + - Issue #27452: add line counter and crc to IDLE configHandler test dump. + + -- Matthias Klose Thu, 01 Sep 2016 22:27:38 +0200 + +python2.7 (2.7.12-2) unstable; urgency=medium + + * Update to 20160804 from the 2.7 branch. + - Issue #27473: Fixed possible integer overflow in str, unicode and + bytearray concatenations and repetitions. + - Issue #27507: Add integer overflow check in bytearray.extend(). + - Issue #27581: Don't rely on wrapping for overflow check in + PySequence_Tuple(). + - Issue #23908: os functions, open() and the io.FileIO constructor now + reject unicode paths with embedded null character on Windows instead of + silently truncating them. + - Issue #27514: Make having too many statically nested blocks a SyntaxError + instead of SystemError. + - Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the + HTTP_PROXY variable when REQUEST_METHOD environment is set, which + indicates that the script is in CGI mode. + - Issue #27130: In the "zlib" module, fix handling of large buffers + (typically 2 or 4 GiB). Previously, inputs were limited to 2 GiB, and + compression and decompression operations did not properly handle results + of 2 or 4 GiB. + - Issue #23804: Fix SSL zero-length recv() calls to not block and not raise + an error about unclean EOF. + - Issue #27466: Change time format returned by http.cookie.time2netscape, + confirming the netscape cookie format and making it consistent with + documentation. + - Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong + mode no longer break tracing, trace_vinfo() now always returns a list of + pairs of strings. + - Issue #27079: Fixed curses.ascii functions isblank(), iscntrl() and + ispunct(). + - Issue #22636: Avoid shell injection problems with + ctypes.util.find_library(). + - Issue #27330: Fixed possible leaks in the ctypes module. + - Issue #27238: Got rid of bare excepts in the turtle module. + - Issue #26386: Fixed ttk.TreeView selection operations with item id's + containing spaces. + - Issue #25455: Fixed a crash in repr of cElementTree.Element with + recursive tag. + - Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor + names. + - Issue #27245: IDLE: Cleanly delete custom themes and key bindings. + Previously, when IDLE was started from a console or by import, a cascade + of warnings was emitted. + - Issue #16484: Change the default PYTHONDOCS URL to "https:", and fix the + resulting links to use lowercase. + - Issue #27369: In test_pyexpat, avoid testing an error message detail that + changed in Expat 2.2.0. + * Fix issue 27239, idlelib: macos _tk_type shall always be "other". + Closes: #830686. + * Ignore the winreg module for the set of minimal modules. Closes: #830573. + + -- Matthias Klose Thu, 04 Aug 2016 22:04:34 +0200 + +python2.7 (2.7.12-1) unstable; urgency=medium + + * Python 2.7.12 release. + + -- Matthias Klose Wed, 29 Jun 2016 10:18:26 +0200 + +python2.7 (2.7.12~rc1-2) unstable; urgency=medium + + * Extend debian/copyright to the files shipped in the wheel files. + + -- Matthias Klose Mon, 13 Jun 2016 11:20:59 +0200 + +python2.7 (2.7.12~rc1-1) unstable; urgency=medium + + * Python 2.7.12 release candidate 1. + - Issue #20041: Fixed TypeError when frame.f_trace is set to None. + - Issue #25702: A --with-lto configure option has been added that will + enable link time optimizations at build time during a make profile-opt. + Some compilers and toolchains are known to not produce stable code when + using LTO, be sure to test things thoroughly before relying on it. + It can provide a few % speed up over profile-opt alone. + - Issue #26556: Update expat to 2.1.1, fixes CVE-2015-1283. + - Fix TLS stripping vulnerability in smptlib, CVE-2016-0772. + - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of + the locale. + - Issue #25738: Stop BaseHTTPServer.BaseHTTPRequestHandler.send_error() + from sending a message body for 205 Reset Content. Also, don't send the + Content-Type header field in responses that don't have a body. + - Issue #21313: Fix the "platform" module to tolerate when sys.version + contains truncated build information. + - Issue #27211: Fix possible memory corruption in io.IOBase.readline(). + - Issue #5124: Paste with text selected now replaces the selection on X11. + This matches how paste works on Windows, Mac, most modern Linux apps, + and ttk widgets. + - Issue #24759: Make clear in idlelib.idle_test.__init__ that the directory + is a private implementation of test.test_idle and tool for maintainers. + - Issue #21916: Added tests for the turtle module. + - Issue #27229: Fix the cross-compiling pgen rule for in-tree builds. + - Issue #17500, and https://github.com/python/pythondotorg/issues/945: Remove + unused and outdated icons. + + -- Matthias Klose Mon, 13 Jun 2016 09:07:49 +0200 + +python2.7 (2.7.11-11) unstable; urgency=medium + + * Update to 20160602 from the 2.7 branch. + - Issue #26168: Fixed possible refleaks in failing Py_BuildValue() with + the "N" format unit. + - Issue #27114: Fix SSLContext._load_windows_store_certs fails with + PermissionError. + - Issue #26673: When tk reports font size as 0, change to size 10. + Such fonts on Linux prevented the configuration dialog from opening. + - Issue #27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks. + - In the 'IDLE-console differences' section of the IDLE doc, clarify + how running with IDLE affects sys.modules and the standard streams. + - Issue #25507: Fix incorrect change in IOBinding that prevented printing. + Change also prevented saving shell window with non-ascii characters. + Augment IOBinding htest to include all major IOBinding functions. + - Issue #25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION + MARK in README.txt and open this and NEWS.txt with 'ascii'. + Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'. + * Rebuild to pick up the GNU triplet change on i386 archs. Closes: #826128. + + -- Matthias Klose Thu, 02 Jun 2016 21:34:15 +0200 + +python2.7 (2.7.11-10) unstable; urgency=medium + + * Update to 20160518 from the 2.7 branch. + - Issue #27039: Fixed bytearray.remove() for values greater than 127. + - Issue #14132: Fix urllib.request redirect handling when the target only + has a query string. + - Removed the requirements for the ctypes and modulefinder modules to be + compatible with earlier Python versions. + - Issue #22274: In the subprocess module, allow stderr to be redirected to + stdout even when stdout is not redirected. + - Issue #12045: Avoid duplicate execution of command in + ctypes.util._get_soname(). + - Issue #26960: Backported #16270 from Python 3 to Python 2, to prevent + urllib from hanging when retrieving certain FTP files. + + -- Matthias Klose Wed, 18 May 2016 21:39:41 +0200 + +python2.7 (2.7.11-9) unstable; urgency=medium + + * Update to 20160509 from the 2.7 branch. + - Issue #25745: Fixed leaking a userptr in curses panel destructor. + - Issue #17765: weakref.ref() no longer silently ignores keyword arguments. + - Issue #26873: xmlrpclib now raises ResponseError on unsupported type tags + instead of silently return incorrect result. + - Issue #24114: Fix an uninitialized variable in `ctypes.util`. + - Issue #26864: In urllib, change the proxy bypass host checking against + no_proxy to be case-insensitive, and to not match unrelated host names + that happen to have a bypassed hostname as a suffix. + - Issue #26804: urllib will prefer lower_case proxy environment variables + over UPPER_CASE or Mixed_Case ones. + - Issue #26837: assertSequenceEqual() now correctly outputs non-stringified + differing items. This affects assertListEqual() and assertTupleEqual(). + - Issue #26822: itemgetter, attrgetter and methodcaller objects no longer + silently ignore keyword arguments. + - Issue #26657: Fix directory traversal vulnerability with SimpleHTTPServer + on Windows. This fixes a regression that was introduced in 2.7.7. + - Issue #26736: Used HTTPS for external links in the documentation if + possible. + - Issue #22359: Avoid incorrect recursive $(MAKE), and disable the rules for + running pgen when cross-compiling. + - Issue #26799: Fix python-gdb.py: don't get C types once when the Python + code is loaded, but get C types on demand. The C types can change if + python-gdb.py is loaded before the Python executable. + * Fix issue #26673, runtime error in idle3. LP: #1578927. + + -- Matthias Klose Mon, 09 May 2016 17:54:33 +0200 + +python2.7 (2.7.11-8) unstable; urgency=medium + + * Update to 20160417 from the 2.7 branch. + - Issue #4806: Avoid masking the original TypeError exception when using + star (*) unpacking and the exception was raised from a generator. + - Issue #26659: Make the builtin slice type support cycle collection. + - Issue #26718: super.__init__ no longer leaks memory if called multiple + times. NOTE: A direct call of super.__init__ is not endorsed! + - Issue #13410: Fixed a bug in PyUnicode_Format where it failed to properly + ignore errors from a __int__() method. + - Issue #19377: Add .svg to mimetypes.types_map. + - Issue #13952: Add .csv to mimetypes.types_map. + - Issue #16329: Add .webm to mimetypes.types_map. + - Issue #23735: Handle terminal resizing with Readline 6.3+ by installing + our own SIGWINCH handler. + - Issue #6953: Rework the Readline module documentation to group related + functions together, and add more details such as what underlying Readline + functions and variables are accessed. + * Fix gdb auto-load symlink for the python2.7 binary. LP: #1571198. + + -- Matthias Klose Sun, 17 Apr 2016 16:00:29 +0200 + +python2.7 (2.7.11-7) unstable; urgency=medium + + * Update to 20160330 from the 2.7 branch. + + -- Matthias Klose Wed, 30 Mar 2016 23:00:42 +0200 + +python2.7 (2.7.11-6) unstable; urgency=medium + + * Update to 20160323 from the 2.7 branch. + * Always build _math.o with -fPIC. + + -- Matthias Klose Wed, 23 Mar 2016 12:35:56 +0100 + +python2.7 (2.7.11-5) unstable; urgency=medium + + * Update to 20160319, taken from the 2.7 release branch. + * Update symbols files. + * Don't run test_signal on alpha, hanging on the buildd. + + -- Matthias Klose Sat, 19 Mar 2016 13:14:21 +0100 + +python2.7 (2.7.11-4) unstable; urgency=medium + + * Update to 20160222, taken from the 2.7 release branch. + + -- Matthias Klose Mon, 22 Feb 2016 17:38:42 +0100 + +python2.7 (2.7.11-3) unstable; urgency=medium + + * Revert patches concerning issue #22995. + + -- Matthias Klose Mon, 11 Jan 2016 22:04:40 +0100 + +python2.7 (2.7.11-2) unstable; urgency=medium + + * Disable LTO on ppc64, ppc64el and s390x. + * Don't run the test_signal tests on alpha. + + -- Matthias Klose Wed, 09 Dec 2015 01:29:25 +0100 + +python2.7 (2.7.11-1) unstable; urgency=medium + + * Python 2.7.11 release. + * Don't run the test_cpickle test, causes other tests to fail. + See issue 25698. + * Fix building architecture independent packages only. Closes: #806868. + * Don't ship menu files anymore, just desktop files. + * d/p/fix-sslv3-test.diff: properly handle Ubuntu's openssl having OP_NO_SSLv3 + forced on by default (Marc Deslauriers). + * Update symbols files. + + -- Matthias Klose Mon, 07 Dec 2015 14:27:52 +0100 + +python2.7 (2.7.10-5) unstable; urgency=medium + + * Update to 20151010, taken from the 2.7 release branch. + * Adjust setting DH_COMPAT for dh_movefiles with updated debhelper supporting + globbing of arguments. Closes: #800301. + * pydoc: use the pager command if available. Closes: #799555. + + -- Matthias Klose Sat, 10 Oct 2015 11:11:24 +0200 + +python2.7 (2.7.10-4) unstable; urgency=medium + + * Remove byte-code for _sysconfigdata_d.py in /usr/lib/python2.7. + Closes: #793528. + * Make derivatives builds the same as the parent distro. Closes: #797667. + + -- Matthias Klose Sun, 13 Sep 2015 22:30:50 +0200 + +python2.7 (2.7.10-3) unstable; urgency=medium + + * Revert issue #24134 changes, taken from the branch. + * Add hint to install the idle package when trying to run the turtle demo. + Closes: #788621. + + -- Matthias Klose Wed, 01 Jul 2015 12:54:53 +0200 + +python2.7 (2.7.10-2) unstable; urgency=medium + + * Cherry-pick some changes from the 2.7 branch: + - Issue #24264: Fixed buffer overflow in the imageop module. + - Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(), + PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains() + to check for and handle errors correctly. + - Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port + value in the host header was set to "None". + - Issue #4753, backport computed gotos. + * Configure --with-computed-gotos. + * Make the build reproducible (Jérémy Bobbio). Closes: #786978. + - Pass time of latest debian/changelog entry to sphinx via SPHINXOPTS. + - Do not store a timestamps when compressing devhelp. + * Pass DATE and TIME macros matching the current debian/changelog entry + when building getbuildinfo.o. + * Don't run the test_io test on sparc. + + -- Matthias Klose Mon, 01 Jun 2015 18:21:46 +0200 + +python2.7 (2.7.10-1) unstable; urgency=medium + + * Python 2.7.10 release. + + -- Matthias Klose Tue, 26 May 2015 14:47:02 +0200 + +python2.7 (2.7.10~rc1-1) unstable; urgency=medium + + * Python 2.7.10 release candidate 1. + * Re-enable running the tests, re-enable the pgo/lto build. + + -- Matthias Klose Sun, 10 May 2015 23:40:03 +0200 + +python2.7 (2.7.9-5) unstable; urgency=medium + + * Update to 20150507, taken from the 2.7 release branch. + - Issue #24134: assertRaises() and assertRaisesRegexp() checks are not + longer successful if the callable is None. + - Issues #24099, #24100, and #24101: Fix free-after-use bug in heapq's + siftup and siftdown functions. + - Backport collections.deque fixes from Python 3.5. Prevents reentrant + badness during deletion by deferring the decref until the container has + been restored to a consistent state. + - Issue #24125: Saved error's line and column numbers when an error + occured. Fixes python-docutils. Closes: #784270. + - Issue #23842, SystemError in os.minor, os.major. Closes: #782081. + + -- Matthias Klose Wed, 06 May 2015 22:47:05 +0200 + +python2.7 (2.7.9-4) unstable; urgency=medium + + * Fix installation of the optimized interpreter. Closes: #766877. + + -- Matthias Klose Wed, 29 Apr 2015 19:09:39 +0200 + +python2.7 (2.7.9-3) unstable; urgency=medium + + * Update to 20150429, taken from the 2.7 release branch. + - Issue #23629: Fix the default __sizeof__ implementation for + variable-sized objects. + - Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. + - Issue #23838: linecache now clears the cache and returns an empty + result on MemoryError. + - Issue #23742: ntpath.expandvars() no longer loses unbalanced single + quotes. + - Issue #21802: The reader in BufferedRWPair now is closed even when + closing writer failed in BufferedRWPair.close(). + - Issue #23671: string.Template now allows to specify the "self" parameter + as keyword argument. string.Formatter now allows to specify the "self" + and the "format_string" parameters as keyword arguments. + - Issue #21560: An attempt to write a data of wrong type no longer cause + GzipFile corruption. + - Issue #23647: Increase imaplib's MAXLINE to accommodate modern mailbox + sizes. + - Issue #23539: If body is None, http.client.HTTPConnection.request now + sets Content-Length to 0 for PUT, POST, and PATCH headers to avoid + 411 errors from some web servers. + - Issue #23136: _strptime now uniformly handles all days in week 0, + including Dec 30 of previous year. + - Issue #23138: Fixed parsing cookies with absent keys or values in + cookiejar. + - Issue #23051: multiprocessing.Pool methods imap() and imap_unordered() + now handle exceptions raised by an iterator. + - Issue #22928: Disabled HTTP header injections in httplib. + - Issue #23615: Module tarfile now can be reloaded with imp.reload(). + - Issue #23799: Added test.test_support.start_threads() for running and + cleaning up multiple threads. + - Issue #22390: test.regrtest now emits a warning if temporary files or + directories are left after running a test. + - Issue #23583: Added tests for standard IO streams in IDLE. + - Issue #23583: Fixed writing unicode to standard output stream in IDLE. + - Issue #22853: Fixed a deadlock when use multiprocessing.Queue at import + time. + - Issue #23476: In the ssl module, enable OpenSSL's + X509_V_FLAG_TRUSTED_FIRST flag on certificate stores when it is available. + - Issue #23576: Avoid stalling in SSL reads when EOF has been reached + in the SSL layer but the underlying connection hasn't been closed. + - Issue #23504: Added an __all__ to the types module. + - Issue #23367: Fix possible overflows in the unicodedata module. + - Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. + - Issue #23048: Fix jumping out of an infinite while loop in the pdb. + - Issue #23458: On POSIX, the file descriptor kept open by os.urandom() is + now set to non inheritable. + - Issue #22113: struct.pack_into() now supports new buffer protocol (in + particular accepts writable memoryview). + - Issues #814253, #9179: Warnings now are raised when group references and + conditional group references are used in lookbehind assertions in regular + expressions. + - Issue #23215: Multibyte codecs with custom error handlers that ignores + errors consumed too much memory and raised SystemError or MemoryError. + - Issue #5700: io.FileIO() called flush() after closing the file. + flush() was not called in close() if closefd=False. + - Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with + empty docstrings. + - Issue #22885: Fixed arbitrary code execution vulnerability in the dumbdbm + module. + - Issue #23481: Remove RC4 from the SSL module's default cipher list. + - Issue #21849: Fixed xmlrpclib serialization of non-ASCII unicode strings + in the multiprocessing module. + - Issue #21840: Fixed expanding unicode variables of form $var in + posixpath.expandvars(). Fixed all os.path implementations on + unicode-disabled builds. + - Issue #23363: Fix possible overflow in itertools.permutations. + - Issue #23364: Fix possible overflow in itertools.product. + - Issue #23365: Fixed possible integer overflow in + itertools.combinations_with_replacement. + - Issue #23366: Fixed possible integer overflow in itertools.combinations. + - Issue #23191: fnmatch functions that use caching are now threadsafe. + - Issue #18518: timeit now rejects statements which can't be compiled + outside a function or a loop (e.g. "return" or "break"). + - Issue #19996: Make :mod:`httplib` ignore headers with no name rather than + assuming the body has started. + - Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the + ssl module. + - Issue #23248: Update ssl error codes from latest OpenSSL git master. + - Issue #23098: 64-bit dev_t is now supported in the os module. + - Issue #23063: In the disutils' check command, fix parsing of reST with + code or code-block directives. + - Issue #21356: Make ssl.RAND_egd() optional to support LibreSSL. The + availability of the function is checked during the compilation. + - Backport the context argument to ftplib.FTP_TLS. + - Issue #23111: Maximize compatibility in protocol versions of + ftplib.FTP_TLS. + - Issue #23112: Fix SimpleHTTPServer to correctly carry the query string + and fragment when it redirects to add a trailing slash. + - Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls + getentropy(), instead of reading /dev/urandom, to get pseudo-random bytes. + - Issue #23093: In the io, module allow more operations to work on detached + streams. + - Issue #23071: Added missing names to codecs.__all__. + - Issue #23016: A warning no longer produces an AttributeError when + sys.stderr is None. + - Issue #21032. Fixed socket leak if HTTPConnection.getresponse() fails. + Original patch by Martin Panter. + - Issue #22609: Constructors and update methods of mapping classes in the + collections module now accept the self keyword argument. + - Issue #23006: Improve the documentation and indexing of dict.__missing__. + Add an entry in the language datamodel special methods section. + Revise and index its discussion in the stdtypes mapping/dict section. + Backport the code example from 3.4. + - Issue #21514: The documentation of the json module now refers to new + JSON RFC 7159 instead of obsoleted RFC 4627. + - Issue #6639: Module-level turtle functions no longer raise TclError after + closing the window. + - Issue #22314: pydoc now works when the LINES environment variable is set. + - Issue #18905: "pydoc -p 0" now outputs actually used port. + - Issue #23345: Prevent test_ssl failures with large OpenSSL patch level + values (like 0.9.8zc). + - Issue #23392: Added tests for marshal C API that works with FILE*. + - Issue #18982: Add tests for CLI of the calendar module. + - Issue #19949: The test_xpickle test now tests compatibility with installed + Python 2.7 and reports skipped tests. + - Issue #11578: Backported test for the timeit module. + - Issue #22943: bsddb tests are locale independend now. + - Issue #20577: Configuration of the max line length for the FormatParagraph + extension has been moved from the General tab of the Idle preferences + dialog to the FormatParagraph tab of the Config Extensions dialog. + - Issue #16893: Update Idle doc chapter to match current Idle and add new + information. + - Issue #23180: Rename IDLE "Windows" menu item to "Window". + - Issue #15506: Use standard PKG_PROG_PKG_CONFIG autoconf macro in the + configure script. + - Issue #22079: PyType_Ready() now checks that statically allocated type has + no dynamically allocated bases. + * Re-apply the fix for issue #22079. This is now a warning instead of an + error. LP: #1426294. + * Fix issue #23842, SystemError in os.minor, os.major. LP: #1435242. + * When using GCC versions older than 4.9 for extension builds, automagically + mangle -fstack-protector-strong to -fstack-protector. + * debian/tests: Use init system agnostic "service" command instead of + upstart specific "stop". Also drop unnecessary "status" call right after + stopping apport. + * Refresh patches. + + -- Matthias Klose Wed, 29 Apr 2015 03:03:55 +0200 + +python2.7 (2.7.9-2) unstable; urgency=medium + + * python2.7-minimal: Make Pre-Depends mangling more robust. Closes: #779294. + * python2.7-doc: Depend on libjs-underscore. LP: #1424538. + * Remove LTO sections from the static libraries. Closes: #698395. + + -- Matthias Klose Sun, 01 Mar 2015 10:56:57 +0100 + +python2.7 (2.7.9-1) unstable; urgency=medium + + * Python 2.7.9 release. + + -- Matthias Klose Thu, 11 Dec 2014 00:38:09 +0100 + +python2.7 (2.7.9~rc1-2) unstable; urgency=medium + + * Update to 20141209, taken from the 2.7 release repository. + - Issue #22959: Remove the *check_hostname* parameter of + httplib.HTTPSConnection. The *context* parameter should be used instead. + - Issue #16043: Add a default limit for the amount of data + xmlrpclib.gzip_decode will return. This resolves CVE-2013-1753. + Closes: #742929. + - Issue #16042: CVE-2013-1752: smtplib: Limit amount of data read by + limiting the call to readline(). Closes: #742929. + - Issue #16041: In poplib, limit maximum line length read from the server + to prevent CVE-2013-1752. Closes: #742929. + - Issue #22960: Add a context argument to xmlrpclib.ServerProxy. + - Issue #22935: Allow the ssl module to be compiled if openssl + doesn't support SSL 3. + * Add locales to autopkg test dependencies as in 3.4. + * Remove Demo/scripts/newslist.* from the examples package, not + distributable, will get removed in 2.7.9~rc2 sources. See issue #12987. + * Let ensurepip always use a temporary directory for installations. + + -- Matthias Klose Tue, 09 Dec 2014 15:47:40 +0100 + +python2.7 (2.7.9~rc1-1) unstable; urgency=medium + + * Python 2.7.9 release candidate 1. + - Testsuite updates. + - Issue #16056: Rename test methods to avoid conflict. + - Issue #20351: Add examples for csv.DictReader and csv.DictWriter. + - PEP 476: verify certificates by default (#22417). + - Give urllib.urlopen a context parameter (closes #22927). + - Allow hostname to be passed to SSLContext even if OpenSSL doesn't + support SNI (closes #22921). + - Allow passing cert/ssl information to urllib2.urlopen and + httplib.HTTPSConnection (backport of issues #9003 and #22366). + * Let libpython2.7-stdlib break python-urllib3 (<< 1.9.1-3). Closes: #770157. + * Ignore the test_threading_local test failure in the Debian CI environment. + Succeeds even there when repeated. + * Don't pass default compiler search directories in the pkgconfig file. + Closes: #770935. + + -- Matthias Klose Wed, 26 Nov 2014 21:01:48 +0100 + +python2.7 (2.7.8-12) unstable; urgency=medium + + * Update to 20141118, taken from the 2.7 branch. + - Issue #12728: Different Unicode characters having the same uppercase + but different lowercase are now matched in case-insensitive regular + expressions. + - Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian + platforms. + - Issues #814253, #9179: Group references and conditional group references + now work in lookbehind assertions in regular expressions. + - Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. + - Issue #22787: Allow the keyfile argument of SSLContext.load_cert_chain + to be None. + - Issue #22775: Fixed unpickling of Cookie.SimpleCookie with protocol 2. + - Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). + - Issue #17381: Fixed ranges handling in case-insensitive regular + expressions. + - Issue #19329: Optimized compiling charsets in regular expressions. + - Issue #22410: Module level functions in the re module now cache compiled + locale-dependent regular expressions taking into account the locale. + - Issue #8876: distutils now falls back to copying files when hard linking + doesn't work. This allows use with special filesystems such as + VirtualBox shared folders. + - Issue #22193: Fixed integer overflow error in sys.getsizeof(). + * Backport the ensurepip patch from 3.4. + * Disable ensurepip in Debian, at least for the upcoming release. + * Fix maintainer scripts for byte-code removal. Closes: #769078. + * Allow building and testing without SSLv3 support (Kurt Roeckx). + Closes: #768611. + * Let distutils.sysconfig.get_python_inc() honor the "prefix" argument. + Closes: #769720. + + -- Matthias Klose Tue, 18 Nov 2014 11:37:13 +0100 + +python2.7 (2.7.8-11) unstable; urgency=medium + + * Update to 20141018, taken from the 2.7 branch. + - Issue #9351: Defaults set with set_defaults on an argparse subparser + are no longer ignored when also set on the parent parser. + - Issue #20421: Add a .version() method to SSL sockets exposing the actual + protocol version in use. + - Issue #22435: Fix a file descriptor leak when SocketServer bind fails. + - Issue #13664: GzipFile now supports non-ascii Unicode filenames. + - Issue #13096: Fixed segfault in CTypes POINTER handling of large + values. + - Issue #11694: Raise ConversionError in xdrlib as documented. + - Issue #10712: 2to3 has a new "asserts" fixer that replaces deprecated names + of unittest methods (e.g. failUnlessEqual -> assertEqual). + * Pass -ffat-lto-objects for LTO enabled builds with GCC 4.9. + + -- Matthias Klose Sat, 18 Oct 2014 14:14:19 +0200 + +python2.7 (2.7.8-10) unstable; urgency=medium + + * Update to 20141007, taken from the 2.7 branch. + + -- Matthias Klose Tue, 07 Oct 2014 19:42:51 +0200 + +python2.7 (2.7.8-9) unstable; urgency=medium + + * Fix refcounting error in the fix for issue #22523. Closes: #762010. + + -- Matthias Klose Thu, 02 Oct 2014 13:49:07 +0200 + +python2.7 (2.7.8-8) unstable; urgency=medium + + * Update to 20141002, taken from the 2.7 branch. + * Refresh patches. + * Apply proposed patch for issue #22523. Closes: #762010. + + -- Matthias Klose Thu, 02 Oct 2014 02:13:37 +0200 + +python2.7 (2.7.8-7) unstable; urgency=medium + + * Update to 20140909, taken from the 2.7 branch. + * debian/tests/testsuite{,-dbg}: Several tests fail with configured proxy + and disabled network test resources. Explicitly unset proxy variables. + See issue #22371. + + -- Matthias Klose Tue, 09 Sep 2014 22:02:11 +0200 + +python2.7 (2.7.8-6) unstable; urgency=medium + + * distuils: For extension builds, always pass BASECFLAGS. + + -- Matthias Klose Sat, 23 Aug 2014 22:50:19 +0200 + +python2.7 (2.7.8-5) unstable; urgency=medium + + * Build-depend on dpkg-dev (>= 1.17.11). + + -- Matthias Klose Mon, 18 Aug 2014 09:43:43 +0200 + +python2.7 (2.7.8-4) unstable; urgency=medium + + * distutils: For extension builds pass the CPPFLAGS, CFLAGS, LDFLAGS + used for the python build when these flags cannot be found in the + environment. + * Don't use the system python during the build. + * Build using autotools-dev. Closes: #756772. + * Pass AR and RANLIB for lto enabled builds. + + -- Matthias Klose Sun, 10 Aug 2014 13:45:31 +0200 + +python2.7 (2.7.8-3) unstable; urgency=medium + + * Call dpkg -L in the maintainer scripts with an architecture qualifier + for M-A: same packages. Closes: #736385. + * Apply the plat-linux2_mips patch for mips64 and mips64el. Closes: #755578. + + -- Matthias Klose Sat, 26 Jul 2014 15:32:47 +0200 + +python2.7 (2.7.8-2) unstable; urgency=medium + + * Revert the backport of issue #1856 (avoid daemon thread problems + at shutdown). Issue #21963. Apparently ceph has issues with it. + Closes: #754341. + + -- Matthias Klose Sat, 12 Jul 2014 10:19:55 +0200 + +python2.7 (2.7.8-1) unstable; urgency=medium + + * Python 2.7.8 release. + + -- Matthias Klose Fri, 04 Jul 2014 14:41:31 +0200 + +python2.7 (2.7.7-2) unstable; urgency=medium + + * Re-enable the test_pydoc, test_tools, test_subprocess and test_uuid + autopkg tests. + * In the autopkg tests, make $ADTTMP accessible to the su user. + + -- Matthias Klose Tue, 03 Jun 2014 10:13:57 +0200 + +python2.7 (2.7.7-1) unstable; urgency=medium + + * Python 2.7.7 release. + * Refresh patches. + * In the autopkg tests, set HOME to the temporary home directory after + the su call. + * Expect test failures in the distutils autopkg tests. + * Disable the test_solaris_enable_shared test. + + -- Matthias Klose Mon, 02 Jun 2014 10:53:46 +0200 + +python2.7 (2.7.7~rc1-1) unstable; urgency=medium + + * Python 2.7.7 release candidate 1. + * Run the testsuite in a temporary home directory. + + -- Matthias Klose Wed, 21 May 2014 12:15:26 +0100 + +python2.7 (2.7.6-8) unstable; urgency=medium + + * Set a temporary home directory for the build and the autopkg tests. + + -- Matthias Klose Sat, 22 Mar 2014 14:31:54 +0100 + +python2.7 (2.7.6-8) unstable; urgency=medium + + * Update to 20140322, taken from the 2.7 branch. + * Install updated idle icons. LP: #1295969. + * Update the ssl.match_hostname backport: Change behavior of + ``ssl.match_hostname()`` to follow RFC 6125, for security reasons. + It now doesn't match multiple wildcards nor wildcards inside IDN fragments. + Closes: #740255. + + -- Matthias Klose Sat, 22 Mar 2014 14:31:54 +0100 + +python2.7 (2.7.6-7) unstable; urgency=medium + + * Include test data for test_imghdr test. + + -- Matthias Klose Wed, 26 Feb 2014 01:16:47 +0100 + +python2.7 (2.7.6-6) unstable; urgency=high + + * Update to 20140225, taken from the 2.7 branch. + - CVE-2014-1912. Fix issue 20246, buffer overflow in socket.recvfrom_into. + * Build without ffi on or1k. Closes: #738519. + * Allow loading of extensions in the sqlite module. Closes: #739555. + * Update autopkg tests (Martin Pitt): + - Don't fail if apport is not installed. + - Call su with explicit shell, as nobody has nologin as default shell now. + - Only use $SUDO_USER if that user actually exists in the testbed. + - Drop obsolete chowning of $TMPDIR and $ADTTMP; with current autopkgtest + $TMPDIR has appropriate permissions, and $ADTTMP is not being used. + + -- Matthias Klose Tue, 25 Feb 2014 10:51:27 +0100 + +python2.7 (2.7.6-5) unstable; urgency=medium + + * Update to 20140111, taken from the 2.7 branch. + * Build-depend on net-tools, required for the test_uuid test. + * Build-depend on the default Tcl/Tk. + * Add two new autopkg tests to run the failing tests. + + -- Matthias Klose Sat, 11 Jan 2014 14:52:11 +0100 + +python2.7 (2.7.6-4) unstable; urgency=medium + + * Update to 20131230, taken from the 2.7 branch. + * Disable sphinx refcounting extension, removed in sphinx-1.2. + Closes: #733404. + + -- Matthias Klose Mon, 30 Dec 2013 15:17:09 +0100 + +python2.7 (2.7.6-3) unstable; urgency=low + + * Update to 20131206, taken from the 2.7 branch. + * Disable the test_uuid autopkg test, hanging, missing entropy? + * Drop python dependency in libpython2.7-dbg. + * Revert patch from http://bugs.python.org/issue19352 as it completely breaks + unittest discovery on Debian/Ubuntu. LP: #1255505. + + -- Matthias Klose Fri, 06 Dec 2013 20:35:22 +0100 + +python2.7 (2.7.6-2) unstable; urgency=low + + * Update to 20131121, taken from the 2.7 branch. + * Fix test support when the running kernel doesn't handle port reuse. + * Build-depend on libdb-dev (<< 1:6.0) instead of a specific db version. + + -- Matthias Klose Fri, 22 Nov 2013 13:06:15 +0100 + +python2.7 (2.7.6-1) unstable; urgency=low + + * Python 2.7.6 release. + * Update to 20131119, taken from the 2.7 branch. + * For autopkg tests, only run the separate tests when defined. + * Don't run the curses autopkg test. + * Disable running the testsuite on mipsn32(el) and mips64(el), + requested by YunQiang Su. Closes: #719057. + + -- Matthias Klose Tue, 19 Nov 2013 11:45:31 +0100 + +python2.7 (2.7.5-8) unstable; urgency=medium + + * Update to 20130917, taken from the 2.7 branch. + - Fix SSL module to handle NULL bytes inside subjectAltNames general + names (CVE-2013-4238). Closes: #719566. + * Don't run the curses autopkg test. + * Set Multi-Arch attributes for binary packages. + * Fix multiarch include header for sparc64. Closes: #714802, #715063. + + -- Matthias Klose Tue, 17 Sep 2013 15:47:45 +0200 + +python2.7 (2.7.5-7) unstable; urgency=low + + * Update to 20130803, taken from the 2.7 branch. + * Update package descriptions (Filipus Klutiero). Closes: #715801. + * Fix multiarch include header for sparc64. Closes: #715063. + * Move removal of the sitecustomize.py file into the libpython-minimal + postrm. Closes: #709964. + + -- Matthias Klose Sun, 04 Aug 2013 11:56:52 +0200 + +python2.7 (2.7.5-6) unstable; urgency=low + + * Update to 20130613, taken from the 2.7 branch. + * Refresh patches. + * Don't run consistency check for cross builds. + * Really skip byte compile of non-existing sitecustomize.py. + * Fix the multiarch header file for mips64 (YunQiang Su). Closes: #710374. + + -- Matthias Klose Thu, 13 Jun 2013 13:06:51 +0200 + +python2.7 (2.7.5-5) unstable; urgency=low + + * Update to 20130602, taken from the 2.7 branch. + * Fix possible abuse of ssl.match_hostname() for denial of service + using certificates with many wildcards (CVE-2013-2099). Closes: #709066. + * Don't try to byte-compile sitecustomize.py if the target of the + symlink doesn't exist anymore. Closes: #709157. + * Handle byte compilation in python2.7{-minimal,}, byte removal in + libpython2.7{-minimal,-stdlib}. Closes: #709964. + * Backport patch to fix issue #13146, possible race conditions when writing + .pyc/.pyo files in py_compile.py (Barry Warsaw). LP: #1058884. + * Fix issue #17988, internal error in regular expression engine on 32bit + targets (closes: #710315). + + -- Matthias Klose Sun, 02 Jun 2013 15:11:19 +0200 + +python2.7 (2.7.5-4) unstable; urgency=low + + * Move the libc dependency of -minimal from Depends to Pre-Depends. + Closes: #708831. + * Disable the test_io test on armel, armhf, mips, mipsel. Hangs the + buildds. + + -- Matthias Klose Mon, 20 May 2013 12:21:06 +0200 + +python2.7 (2.7.5-3) unstable; urgency=high + + * Fix the multiarch header file for ppc64. Closes: #708641. + + -- Matthias Klose Sat, 18 May 2013 20:18:38 +0200 + +python2.7 (2.7.5-2) unstable; urgency=low + + * Only run the _multiprocessing build check on linux targets. + + -- Matthias Klose Wed, 15 May 2013 22:09:30 +0200 + +python2.7 (2.7.5-1) unstable; urgency=low + + * Python 2.7.5 release. + * Set the platinclude dir back to the non-multiarch include path, + where the multiarch pyconfig.h compatibility header is found. + * Fix issue #17703: Fix a regression where an illegal use of Py_DECREF() + after interpreter finalization can cause a crash. + * Issue #17754, setting LANG and LC_ALL for the compiler call in ctypes/util. + * Issue #17761, platform._parse_release_file doesn't close the + /etc/lsb-release file, and doesn't know about 'Ubuntu'. + * Fix autopkg tests. + * Re-enable lto and pgo optimized builds, accidentally disabled for the + last upload. + * more autopkg test fixes. + * Link the ctypes extension with the shared libffi library. + * Fix a distutils test with the deb install layout. + * Move lib2to3 library into libpython2.7-stdlib. Closes: #705078. + * Don't set yet any Multi-Arch: attributes in Debian. + + -- Matthias Klose Wed, 15 May 2013 15:02:13 +0200 + +python2.7 (2.7.4-2) experimental; urgency=low + + * Idle updates: + - Issue #17657: Show full Tk version in IDLE's about dialog. + - Issue #17613: Prevent traceback when removing syntax colorizer. + - Issue #1207589: Backwards-compatibility patch for right-click menu. + - Issue #16887: Now accepts Cancel in tabify/untabify dialog box. + - Issue #14254: Now handles readline correctly across shell restarts. + - Issue #17614: No longer raises exception when quickly closing a file. + - Issue #6698: Now opens just an editor window when configured to do so. + - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status. + * Build a libpython2.7-testsuite package. LP: #301629. + * Add autopkg tests to run the installed testsuite in normal and debug + mode. + * Re-enable running the tests during the build. + * Add the io and _io modules to libpython2.7-minimal. + * Backport ssl.CertificateError as well. Closes: #626539. LP: #1166344. + * Don't ship an uncompress python man page. Closes: #705079. + + -- Matthias Klose Thu, 11 Apr 2013 00:44:48 +0200 + +python2.7 (2.7.4-1ubuntu4) raring; urgency=low + + * Build a libpython2.7-testsuite package. LP: #301629. + * Add autopkg tests to run the installed testsuite in normal and debug + mode. + * Re-enable running the tests during the build. + * Idle updates: + - Issue #17657: Show full Tk version in IDLE's about dialog. + - Issue #17613: Prevent traceback when removing syntax colorizer. + - Issue #1207589: Backwards-compatibility patch for right-click menu. + - Issue #16887: Now accepts Cancel in tabify/untabify dialog box. + - Issue #14254: Now handles readline correctly across shell restarts. + - Issue #17614: No longer raises exception when quickly closing a file. + - Issue #6698: Now opens just an editor window when configured to do so. + - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status. + + -- Matthias Klose Tue, 09 Apr 2013 17:53:02 +0200 + +python2.7 (2.7.4-1ubuntu3) raring; urgency=low + + * Add the io and _io modules to libpython2.7-minimal. LP: #1165172. + * Add missing import for the ssl module. LP: #1166644. + + -- Matthias Klose Tue, 09 Apr 2013 12:11:12 +0200 + +python2.7 (2.7.4-1ubuntu2) raring; urgency=low + + * Backport ssl.CertificateError as well. Closes: #626539. LP: #1166344. + + -- Matthias Klose Mon, 08 Apr 2013 20:59:52 +0200 + +python2.7 (2.7.4-1ubuntu1) raring; urgency=low + + * Merge with Debian; remaining changes: + - Build-depend on python:any instead of python. + + -- Matthias Klose Sat, 06 Apr 2013 17:45:49 +0200 + +python2.7 (2.7.4-1) experimental; urgency=low + + * Python 2.7.4 release. + - Issue #17550: Fix the --enable-profiling configure switch. + - Issue #15801 (again): With string % formatting, relax the type check + for a mapping such that any type with a __getitem__ can be used on the + right hand side. + - Issue #17625: In IDLE, close the replace dialog after it is used. + - Issue #17531: Fix tests that thought group and user ids were always + the int type. Also, always allow -1 as a valid group and user id. + - Issue 17538: Document XML vulnerabilties + * Byte-compile files in libpython2.7-dbg. + * libpython2.7-minimal: Break earlier python2.7-minimal versions. + Closes: #704084. LP: #1157687. + * Call python with -E -S for the byte compilation. + + -- Matthias Klose Sat, 06 Apr 2013 16:38:57 +0200 + +python2.7 (2.7.4~rc1-4) experimental; urgency=low + + * Fix byte-compiliation/-removal for the split-out library packages. + LP: #1160944. + + -- Matthias Klose Sat, 30 Mar 2013 12:51:58 +0100 + +python2.7 (2.7.4~rc1-3) experimental; urgency=low + + * Fix webbrowser update. Closes: #703872. LP: #1159636. + + -- Matthias Klose Mon, 25 Mar 2013 14:33:50 +0100 + +python2.7 (2.7.4~rc1-2) experimental; urgency=low + + * Backport webbrowser updates from 3.3. Closes: #700429. + * Build again using db-5.1 instead of db-5.3. + + -- Matthias Klose Sun, 24 Mar 2013 18:27:57 +0100 + +python2.7 (2.7.4~rc1-1) experimental; urgency=low + + * Python 2.7.4 release candidate 1. + - Issue #10211: Buffer objects expose the new buffer interface internally. + - Issue #10212: cStringIO and struct.unpack support new buffer objects. + - Issue #12098: multiprocessing on Windows now starts child processes + using the same sys.flags as the current process. + - Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal. + - Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or + EAGAIN, retry the select() loop instead of bailing out. + - Issue #1285086: Get rid of the refcounting hack and speed up + urllib.unquote(). + - Issue #17368: Fix an off-by-one error in the Python JSON decoder + that caused a failure while decoding empty object literals when + object_pairs_hook was specified. + - Issue #17477: Update the bsddb module to pybsddb 5.3.0, supporting + db-5.x, and dropping support for db-4.1 and db-4.2. + - Issue #17192: Update the ctypes module's libffi to v3.0.13. This + specifically addresses a stack misalignment issue on x86 and issues on + some more recent platforms. + - Issue #11420: make test suite pass with -B/DONTWRITEBYTECODE set. + - Issue #17299: Add test coverage for cPickle with file objects + and general IO objects. + - Issue #11963: remove human verification from test_parser and + test_subprocess. + - Issue #16004: Add `make touch`. + - Issue #17047: remove doubled words in docs and docstrings + * Rework the sysconfigdata patch into something upstreamable. + + -- Matthias Klose Sun, 24 Mar 2013 01:56:36 +0100 + +python2.7 (2.7.3-16ubuntu2) raring; urgency=low + + * Update to 20130315, taken from the 2.7 branch. + - Issue #1285086: Get rid of the refcounting hack and speed + up urllib.unquote(). + - Issue #17368: Fix an off-by-one error in the Python JSON decoder + that caused a failure while decoding empty object literals when + object_pairs_hook was specified. + - Issue #17299: Add test coverage for cPickle with file objects and general + IO objects. + - Issue #11963: Remove human verification from test_parser and + test_subprocess. + - Issue #16004: Add `make touch`. + - Issue #17412: Update 2.7 Doc/make.bat to also use sphinx-1.0.7. + - Issue #17047: Remove doubled words in docs and docstrings. + * Revert the patch for Issue #1159051, handling corrupted gzip files + with unexpected EOF. LP: #1116079. + + -- Matthias Klose Fri, 15 Mar 2013 12:20:10 -0700 + +python2.7 (2.7.3-16ubuntu1) raring; urgency=low + + * Merge with Debian; remaining changes: + - Build-depend on python:any instead of python. + * Update symbols files. + + -- Matthias Klose Fri, 08 Mar 2013 14:30:55 +0800 + +python2.7 (2.7.3-16) experimental; urgency=low + + * Update to 20130308, taken from the 2.7 branch. + - Issue #10156: In the interpreter's initialization phase, unicode globals + are now initialized dynamically as needed. + - Issue #16975: Fix error handling bug in the escape-decode decoder. + - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase + interface and support all mandatory methods and properties. + - Issue #13454: Fix a crash when deleting an iterator created by + itertools.tee() if all other iterators were very advanced before. + - Issue #3754: fix typo in pthread AC_CACHE_VAL. + - Issue #17029: Let h2py search the multiarch system include directory. + - Issue #16445: Fixed potential segmentation fault when deleting an + exception message. + - Issue #17275: Corrected class name in init error messages of the + C version of BufferedWriter and BufferedRandom. + - Issue #7963: Fixed misleading error message that issued when object is + called without arguments. + - Issue #5308: Raise ValueError when marshalling too large object (a + sequence with size >= 2**31), instead of producing illegal marshal data. + - Issue #17043: The unicode-internal decoder no longer read past the end of + input buffer. + - Issue #16979: Fix error handling bugs in the unicode-escape-decode + decoder. + - Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when + the list is being resized concurrently. + - Issue #17018: Make Process.join() retry if os.waitpid() fails with EINTR. + - Issue #14720: sqlite3: Convert datetime microseconds correctly. + - Issue #17225: JSON decoder now counts columns in the first line starting + with 1, as in other lines. + - Issue #7842: backported fix for py_compile.compile() syntax error + handling. + - Issue #13153: Tkinter functions now raise TclError instead of ValueError + when a unicode argument contains non-BMP character. + - Issue #9669: Protect re against infinite loops on zero-width matching in + non-greedy repeat. + - Issue #13169: The maximal repetition number in a regular expression + has been increased from 65534 to 2147483647 (on 32-bit platform) or + 4294967294 (on 64-bit). + - Issue #11311: StringIO.readline(0) now returns an empty string + as all other file-like objects. + - Issue #16800: tempfile.gettempdir() no longer left temporary files when + the disk is full. Original patch by Amir Szekely. + - Issue #13555: cPickle now supports files larger than 2 GiB. + - Issue #17052: unittest discovery should use self.testLoader. + - Issue #4591: Uid and gid values larger than 2**31 are supported now. + - Issue #17141: random.vonmisesvariate() no more hangs for large kappas. + - Issue #17149: Fix random.vonmisesvariate to always return results in + the range [0, 2*math.pi]. + - Issue #1470548: XMLGenerator now works with UTF-16 and UTF-32 encodings. + - Issue #6975: os.path.realpath() now correctly resolves multiple nested + symlinks on POSIX platforms. + - Issue #17156: pygettext.py now correctly escapes non-ascii characters. + - Issue #7358: cStringIO.StringIO now supports writing to and reading from + a stream larger than 2 GiB on 64-bit systems. + - IDLE was displaying spurious SystemExit tracebacks when running scripts + that terminated by raising SystemExit (i.e. unittest and turtledemo). + - Issue #10355: In SpooledTemporaryFile class mode and name properties and + xreadlines method now work for unrolled files. encoding and newlines + - Issue #16686: Fixed a lot of bugs in audioop module. + - Issue #17073: Fix some integer overflows in sqlite3 module. + - Issue #6083: Fix multiple segmentation faults occured when + PyArg_ParseTuple parses nested mutating sequence. + - Issue #5289: Fix ctypes.util.find_library on Solaris. + - Issue #17106: Fix a segmentation fault in io.TextIOWrapper when an + underlying stream or a decoder produces data of an unexpected type (i.e. + when io.TextIOWrapper initialized with text stream or use bytes-to-bytes + codec). + - Issue #13994: Add compatibility alias in distutils.ccompiler for + distutils.sysconfig.customize_compiler. + - Issue #15633: httplib.HTTPResponse is now mark closed when the server + sends less than the advertised Content-Length. + - Issue #15881: Fixed atexit hook in multiprocessing. + - Issue #14340: Upgrade the embedded expat library to version 2.1.0. + - Issue #11159: SAX parser now supports unicode file names. + - Issue #6972: The zipfile module no longer overwrites files outside of + its destination path when extracting malicious zip files. + - Issue #17049: Localized calendar methods now return unicode if a locale + includes an encoding and the result string contains month or weekday (was + regression from Python 2.6). + - Issue #4844: ZipFile now raises BadZipfile when opens a ZIP file with an + incomplete "End of Central Directory" record. + - Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler + is set to a callable object. + - Issue #17051: Fix a memory leak in os.path.isdir() on Windows. + - Issue #12268: The io module file object write methods no longer abort + early when a write system calls is interrupted (EINTR). + - Issue #17249: convert a test in test_capi to use unittest and reap + threads. + - We now run both test_email.py and test_email_renamed.py when running the + test_email regression test. test_email_renamed contains some tests that + test_email does not. + - Issue #17041: Fix testing when Python is configured with the + --without-doc-strings option. + - Issue #5033: Fix building of the sqlite3 extension module when the + SQLite library version has "beta" in it. + - Issue #17228: Fix building without pymalloc. + - Issue #17086: Backport the patches from the 3.3 branch to cross-build + the package. + - Issue #16406: combine the pages for uploading and registering to PyPI. + - Issue #16403: Document how distutils uses the maintainer field in + PKG-INFO. + - Issue #16695: Document how glob handles filenames starting with a dot. + - Issue #8890: Stop advertising an insecure practice by replacing uses + of the /tmp directory with better alternatives in the documentation. + - Issue #17203: add long option names to unittest discovery docs. + * python2.7-dbg, libpython2.7-dbg: Drop dependency on python. + * python2.7-dbg: Make gdb (not gdb-minimal) a recommendation. + * python2.7: Replace python2.7-minimal (<< 2.7.3-7). Closes: #702005. + * Build the _md5, _sha1, _sha256 and _sha512 extension modules. + * Fix multiarch include for AArch64. + + -- Matthias Klose Fri, 08 Mar 2013 09:54:59 +0800 + +python2.7 (2.7.3-15) experimental; urgency=low + + * Update to 20130124, taken from the 2.7 branch. + - Issue #14850: Now a charmap decoder treats U+FFFE as "undefined mapping" + in any mapping, not only in a Unicode string. + - Issue #11461: Fix the incremental UTF-16 decoder. + - Issue #1159051: GzipFile now raises EOFError when reading a corrupted + file with truncated header or footer. + - Issue #16992: On Windows in signal.set_wakeup_fd, validate the file + descriptor argument. + - Issue #15861: tkinter now correctly works with lists and tuples + containing strings with whitespaces, backslashes or unbalanced braces. + - Issue #10527: Use poll() instead of select() for multiprocessing pipes. + - Issue #9720: zipfile now writes correct local headers for files larger + than 4 GiB. + - Issue #16829: IDLE printing no longer fails if there are spaces or other + special characters in the file path. + - Issue #13899: \A, \Z, and \B now correctly match the A, Z, and B literals + when used inside character classes (e.g. '[\A]'). + - Issue #16398: Optimize deque.rotate() so that it only moves pointers + and doesn't touch the underlying data with increfs and decrefs. + - Issue #15109: Fix regression in sqlite3's iterdump method where it would + die with an encoding error if the database contained string values + containing non-ASCII. + - Issue #15545: Fix regression in sqlite3's iterdump method where it was + failing if the connection used a row factory (such as sqlite3.Row) that + produced unsortable objects. + - Issue #16953: Fix socket module compilation on platforms with + HAVE_BROKEN_POLL. + - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the + build host. + - Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py. + * Backport cross-build support from python3.3. LP: #873007. + * Add pyconfig.h compatibility headers. Closes: #695667. LP: #1094246. + + -- Matthias Klose Thu, 24 Jan 2013 14:57:08 +0100 + +python2.7 (2.7.3-14) experimental; urgency=low + + * Update to 20130105, taken from the 2.7 branch. + - Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB. + - Issue #15516: Fix a bug in PyString_FromFormat where it failed + to properly ignore errors from a __int__() method. + - Issue #16839: Fix a segfault when calling unicode() on a classic class + early in interpreter initialization. + - Issue #16761: Calling ``int()`` and ``long()`` with *base* argument only + now raises TypeError. + - Issue #16828: Fix error incorrectly raised by bz2.compress(''). + LP: #1090043. + - Issue #16819: IDLE method completion now correctly works for unicode + literals. + - Issue 10527: make multiprocessing use poll() instead of select() + if available. + - Issue #16485: Now file descriptors are closed if file header patching + failed on closing an aifc file. + - Issue #12065: connect_ex() on an SSL socket now returns the original + errno when the socket's timeout expires (it used to return None). + - Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. + - Issue #16702: test_urllib2_localnet tests now correctly ignores proxies + for localhost tests. + - Issue #16713: Fix the parsing of tel url with params using urlparse + module. + - Issue #16443: Add docstrings to regular expression match objects. + - Issue #8853: Allow port to be of type long for socket.getaddrinfo(). + - Issue #16597: In buffered and text IO, call close() on the underlying + stream if invoking flush() fails. + - Issue #15701: Fix HTTPError info method call to return the headers + information. + - Issue #14958: Change IDLE systax highlighting to recognize all string + and byte literals currently supported in Python 2.7. + - Issue #15324: Fix regrtest parsing of --fromfile and --randomize options. + - Issue #16618: Add more regression tests for glob. + - Issue #13094: add "Why do lambdas defined in a loop with different values + all return the same result?" programming FAQ. + * python-config --help returns with an exit value 0. LP: #1093860. + * Update package description for the -dbg packages. Closes: #696616. + + -- Matthias Klose Sat, 05 Jan 2013 17:22:13 +0100 + +python2.7 (2.7.3-13) experimental; urgency=low + + * Update to 20121220, taken from the 2.7 branch. + - Issue #16646: ftplib.FTP.makeport() might lose socket error details. + - Issue #16298: In HTTPResponse.read(), close the socket when there is no + Content-Length and the incoming stream is finished. + * Filter out -D_FORTIFY_SOURCE for the debug builds. Meaningless. + * Install the _sysconfigdata.py and python-config.sh from both shared + builds, but don't link extensions against the shared python library. + Closes: #695979. + * Fix python2.7-dbg-config symlink. LP: #1091615. + * During purge, check for existance of /etc/python2.7 before trying + to remove it. Closes: #696023. + * python2.7-dev, libpython2.7-dev: Drop the dependency on libssl-dev. + * debian/patches/sys-multiarch.diff: Expose multiarch tuple as + sys._multiarch (Barry Warsaw). Closes: #695958. + Note: Usage of sysconfig.get_config_var('MULTIARCH') is preferred. + + -- Matthias Klose Thu, 20 Dec 2012 16:57:49 +0100 + +python2.7 (2.7.3-12) experimental; urgency=low + + * Fix typo in pkgconfig file. Closes: #695671, LP: #1088988. + + -- Matthias Klose Mon, 10 Dec 2012 19:10:32 +0100 + +python2.7 (2.7.3-11) experimental; urgency=low + + * Update to 20121210, taken from the 2.7 branch. + - Issue #16602: When a weakref's target was part of a long deallocation + chain, the object could remain reachable through its weakref even though + its refcount had dropped to zero. + - Issue #16588: Silence unused-but-set warnings in Python/thread_pthread. + - Issue #16248: Disable code execution from the user's home directory by + tkinter when the -E flag is passed to Python. Patch by Zachary Ware. + - Issue #16628: Fix a memory leak in ctypes.resize(). + - Issue #13614: Fix setup.py register failure with invalid rst in + description. + - Issue #10182: The re module doesn't truncate indices to 32 bits anymore. + - Issue #16573: In 2to3, treat enumerate() like a consuming call, so + superfluous list() calls aren't added to filter(), map(), and zip() + which are directly passed enumerate(). + - Issue #16476: Fix json.tool to avoid including trailing whitespace. + - Issue #16549: Add tests for json.tools. + - Issue #15990: Improve argument/parameter documentation. + * Use _sysconfigdata.py in distutils.sysconfig. + * Fix distutils.sysconfig.get_{config_h,makefile}_filename for multiarch. + * Backport ssl.match_hostname from Python3. Closes: #626539. + + -- Matthias Klose Mon, 10 Dec 2012 16:06:41 +0100 + +python2.7 (2.7.3-10) experimental; urgency=low + + * Update to 20121128, taken from the 2.7 branch. + - Issue #9011: Fix hacky AST code that modified the CST when compiling + a negated numeric literal. + - Issue #16306: Fix multiple error messages when unknown command line + parameters where passed to the interpreter. + - Issue #15379: Fix passing of non-BMP characters as integers for the + charmap decoder (already working as unicode strings). + - Issue #16453: Fix equality testing of dead weakref objects. + - Issue #9535: Fix pending signals that have been received but not yet + handled by Python to not persist after os.fork() in the child process. + - Issue #15001: fix segfault on "del sys.modules['__main__']". + - Issue #5057: the peepholer no longer optimizes subscription on unicode + literals (e.g. u'foo'[0]) in order to produce compatible pyc files + between narrow and wide builds. + - Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) + now raises an error. + - Issue #14700: Fix buggy overflow checks for large width and precision + in string formatting operations. + - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + received a nonempty dict from the constructor. + - Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + - Issue #14783: Improve int() and long() docstrings and switch docstrings + for unicode(), slice(), range(), and xrange() to use multi-line + signatures. + - Issue #16030: Fix overflow bug in computing the `repr` of an xrange + object with large start, step or length. + - Issue #16029: Fix overflow bug occurring when pickling xranges with large + start, step or length. + - Issue #16037: Limit httplib's _read_status() function to work around + broken HTTP servers and reduce memory usage (backport of a 3.2 fix). + - Issue #13992: The trashcan mechanism is now thread-safe. This eliminates + sporadic crashes in multi-thread programs when several long deallocator + chains ran concurrently and involved subclasses of built-in container + types. + - Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + - Issue #15604: Update uses of PyObject_IsTrue() to check for and handle + errors correctly. + - Issue #15897: zipimport.c doesn't check return value of fseek(). + - Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15033: Fix the exit status bug when modules invoked using + -m switch, return the proper failure return value (1). + - Issue #1160: Fix compiling large regular expressions on UCS2 builds. + - Issue #14313: zipfile now raises NotImplementedError when the compression + type is unknown. + - Issue #16408: Fix file descriptors not being closed in error conditions + in the zipfile module. + - Issue #16327: The subprocess module no longer leaks file descriptors + used for stdin/stdout/stderr pipes to the child when fork() fails. + - Issue #14396: Handle the odd rare case of waitpid returning 0 when not + expected in subprocess.Popen.wait(). + - Issue #16411: Fix a bug where zlib.decompressobj().flush() might try + to access previously-freed memory. + - Issue #16350: zlib.decompressobj().decompress() now accumulates data from + successive calls after EOF in unused_data, instead of only saving the + argument to the last call. decompressobj().flush() now correctly sets + unused_data and unconsumed_tail. A bug in the handling of MemoryError + when setting the unconsumed_tail attribute has also been fixed. + - Issue #12759: sre_parse now raises a proper error when the name + of the group is missing. + - Issue #16152: fix tokenize to ignore whitespace at the end of the code + when no newline is found. + - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click + Context Menu. + - Issue #16230: Fix a crash in select.select() when one the lists changes + size while iterated on. + - Issue #16228: Fix a crash in the json module where a list changes size + while it is being encoded. + - Issue #14897: Enhance error messages of struct.pack and struct.pack_into. + - Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + - Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile(). + - Issue #16220: wsgiref now always calls close() on an iterable response. + - Issue #16461: Wave library should be able to deal with 4GB wav files, + and sample rate of 44100 Hz. + - Issue #16176: Properly identify Windows 8 via platform.platform(). + - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to + return a returncode of 0 when the child has already exited or cannot + be waited on. + - Issue #12376: Pass on parameters in TextTestResult.__init__ super call. + - Issue #15222: Insert blank line after each message in mbox mailboxes. + - Issue #16013: Fix CSV Reader parsing issue with ending quote characters. + - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after + datetime.MAXYEAR. + - Issue #15970: xml.etree.ElementTree now serializes correctly the + empty HTML elements 'meta' and 'param'. + - Issue #15676: Now "mmap" check for empty files before doing the + offset check. + - Issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. This was a regression caused by the hash randomization patch. + - Issue #15841: The readable(), writable() and seekable() methods of + io.BytesIO and io.StringIO objects now raise ValueError when the object + has been closed. + - Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. + - Issue #12776,#11839: call argparse type function (specified by + add_argument) only once. Before, the type function was called twice in + the case where the default was specified and the argument was given as + well. This was especially problematic for the FileType type, as a + default file would always be opened, even if a file argument was + specified on the command line. + - Issue #15906: Fix a regression in argparse caused by the preceding change, + when action='append', type='str' and default=[]. + - Issue #13370: Ensure that ctypes works on Mac OS X when Python is + compiled using the clang compiler + - Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs. + - Issue #15199: Fix JavaScript's default MIME type to + application/javascript. + - Issue #15477: In cmath and math modules, add workaround for platforms + whose system-supplied log1p function doesn't respect signs of zeros. + - Issue #15908: Fix misbehaviour of the sha1 module when called on data + larger than 2**32 bytes. + - Issue #15910: Fix misbehaviour of _md5 and sha1 modules when "updating" + on data larger than 2**32 bytes. + - Fix the leak of a dict in the time module when used in an embedded + interpreter that is repeatedly initialized and shutdown and reinitialized. + - Issue #12268: File readline, readlines and read or readall methods + no longer lose data when an underlying read system call is interrupted + within an io module object. IOError is no longer raised due to a read + system call returning EINTR from within these methods. + - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD() + method doesn't require an argument again. + - Issue #16559: Add more tests for the json module, including some from the + official test suite at json.org. + - Issue #16274: Fix test_asyncore on Solaris. + - Issue #15040: Close files in mailbox tests for PyPy compatibility. + - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. + - Issue #15765: Extend a previous fix to Solaris and OpenBSD for quirky + getcwd() behaviour (issue #9185) to NetBSD as well. + - Issue #15615: Add some tests for the json module's handling of invalid + input data. + - Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError + after 2801bf875a24 (see #15801). + - Issue #11715: Fix multiarch detection without having Debian development + tools (dpkg-dev) installed. + - Issue #15819: Make sure we can build Python out-of-tree from a readonly + source directory. (Somewhat related to Issue #9860.) + - Issue #15822: Ensure 2to3 grammar pickles are properly installed. + - Issue #13301: use ast.literal_eval() instead of eval() + in Tools/i18n/msgfmt.py. + - Issue #16400: Update the description of which versions of a given package + PyPI displays. + - Issue #15677: Document that zlib and gzip accept a compression level + of 0 to mean 'no compression'. + - Issue #8040: added a version switcher to the documentation. + - Issue #16115: Improve subprocess.Popen() documentation around args, + shell, and executable arguments. + - Issue #15979: Improve timeit documentation. + - Issue #16036: Improve documentation of built-in int()'s signature and + arguments. + - Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. + - Issue #13769: Document the effect of ensure_ascii to the return type + of JSON decoding functions. + - Issue #14880: Fix kwargs notation in csv.reader, + .writer & .register_dialect. + - Issue #14674: Add a discussion of the json module's standard compliance. + * Clarify location of the gdbinit file. LP: #975676. + * Fix traceback for missing distutils wininst .exe files. LP: #1081155. + * Backport python3.3 multiarch packaging changes (Riku Voipio), and fix + multiarch issues discovered after the backport. + Closes: #683755. + * Use a shell implementation for the python-config script. + + -- Matthias Klose Thu, 29 Nov 2012 20:18:20 +0100 + +python2.7 (2.7.3-5) unstable; urgency=low + + * Enable verbose build for the sharedmods target. + * Fix issue #15847: allow args to be a tuple in parse_args. Closes: #686583. + * Fix issue #15340: Fix importing the random module when /dev/urandom cannot + be opened. Regression caused by the hash randomization patch. + * Don't use `-n' anymore to start idle in the desktop/menu files, not + needed anymore for multiseat installations. + + -- Matthias Klose Sun, 09 Sep 2012 16:54:26 +0200 + +python2.7 (2.7.3-4) unstable; urgency=low + + * Follwup for issue #9374. Restore the removed attributes in the + urlparse module. + * Update symbols files. + * Disable test_subprocess on the Hurd buildds. + * Call dh_movefiles with --srcdir. Closes: #685543. + + -- Matthias Klose Sun, 26 Aug 2012 12:24:31 +0200 + +python2.7 (2.7.3-3) unstable; urgency=low + + * Update to 20120814, taken from the 2.7 branch. Posix relevant patches: + - Issue #15041: Update "see also" list in tkinter documentation. + - Issue #14579: Fix error handling bug in the utf-16 decoder. + - Issue #15368: An issue that caused bytecode generation to be + non-deterministic when using randomized hashing (-R) has been fixed. + - Issue #15567: Fix NameError when running threading._test + - Issue #15424: Add a __sizeof__ implementation for array objects. + - Issue #13052: Fix IDLE crashing when replace string in Search/Replace + dialog ended with '\'. + - Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo() + emulation code. + - Issue #9803: Don't close IDLE on saving if breakpoint is open. + - Issue #12288: Consider '0' and '0.0' as valid initialvalue + for tkinter SimpleDialog. + - Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + - Issue #15469: Add a __sizeof__ implementation for deque objects. + - Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. + - Issue #15512: Add a __sizeof__ implementation for parser. + - Issue #15402: An issue in the struct module that caused sys.getsizeof to + return incorrect results for struct.Struct instances has been fixed. + - Issue #15232: when mangle_from is True, email.Generator now correctly + mangles lines that start with 'From ' that occur in a MIME preamble + or epilog. + - Issue #13922: argparse no longer incorrectly strips '--'s that appear + after the first one. + - Issue #12353: argparse now correctly handles null argument values. + - Issue #14635: telnetlib will use poll() rather than select() when possible + to avoid failing due to the select() file descriptor limit. + - Issue #6056: Make multiprocessing use setblocking(True) on the + sockets it uses. + - Issue #15630: Add an example for "continue" stmt in the tutorial. + - Issue #15250: Document that filecmp.dircmp compares files shallowly. + * Fortified build. + * Python/import.c: Don't export isdir(). + * Modules/socketmodule.c: Don't export netdb_lock. + * Add breaks for vim-{nox,gtk,gnome,athena}. Closes: #682034. + * Don't ship python2.pc, should be shipped with python-dev instead. + Closes: #684612. + + -- Matthias Klose Tue, 14 Aug 2012 17:55:32 +0200 + +python2.7 (2.7.3-2) unstable; urgency=low + + * Update to 20120713, taken from the 2.7 branch. + - Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). + - Issue #12268: File readline, readlines and read() methods no longer lose + data when an underlying read system call is interrupted. IOError is no + longer raised due to a read system call returning EINTR from within these + methods. + - Issue #13512: Create ~/.pypirc securely (CVE-2011-4944). + - Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking + later on. + - Issue #10053: Don't close FDs when FileIO.__init__ fails. + - Issue #15247: FileIO now raises an error when given a file descriptor + pointing to a directory. + - Issue #14591: Fix bug in Random.jumpahead that could produce an invalid + Mersenne Twister state on 64-bit machines. + - Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox + files on flush(). + - Issue #15219: Fix a reference leak when hashlib.new() is called with + invalid parameters. + - Issue #9559: If messages were only added, a new file is no longer + created and renamed over the old file when flush() is called on an + mbox, MMDF or Babyl mailbox. + - Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + - Issue #15101: Make pool finalizer avoid joining current thread. + - Issue #15054: A bug in tokenize.tokenize that caused string literals + with 'b' and 'br' prefixes to be incorrectly tokenized has been fixed. + - Issue #15036: Mailbox no longer throws an error if a flush is done + between operations when removing or changing multiple items in mbox, + MMDF, or Babyl mailboxes. + - Issue #15043: test_gdb is now skipped entirely if gdb security settings + block loading of the gdb hooks + - Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + * Don't build the _hashlib and _ssl extensions as a builtin, but as + extensions. Closes: #680930. + * Backport issue #13150: sysconfig no longer parses the Makefile and config.h + files when imported, instead doing it at build time. This makes importing + sysconfig faster and reduces Python startup time by 20%. + * python2.7: Add a break for python-virtualenv (<< 1.7.1.2-2~). + * Don't run the test_gdb test on mips/mipsel, not even in debug mode. + * For lto builds, use -g instead of -g1; filter out lto flags in the + installed Makefile. Closes: #681348. + + -- Matthias Klose Fri, 13 Jul 2012 05:03:43 +0200 + +python2.7 (2.7.3-1) unstable; urgency=low + + * Python 2.7.3 release. + * Update to 20120615, taken from the 2.7 branch. + * The wininst-* files cannot be built within Debian from the included + sources, needing a zlib mingw build, which the zlib maintainer isn't + going to provide. Closes: #639407. + * Let pydoc handle dist-packages the same as site-packages. + Closes: #671021. + * python2.7-doc: Fix underscore.js symlink. Closes: #671795, #676339. + * Do not italicize punctuation in python(1) manual page (Matt Kraai). + Closes: #579269. + * Build _heapq as a builtin (and move it to -minimal). + + -- Matthias Klose Fri, 15 Jun 2012 15:26:21 +0200 + +python2.7 (2.7.3~rc2-2.1) unstable; urgency=low + + * Non-maintainer upload (with maintainer's permission). + * Disable testsuite on GNU/kFreeBSD. (Closes: #669281) + + -- Robert Millan Sun, 22 Apr 2012 22:04:26 +0200 + +python2.7 (2.7.3~rc2-2) unstable; urgency=low + + * Use xdg-open/gvfs-open in Lib/webbrowser.py (Michael Vogt). + LP: #971311. + * Add a paragraph about python-foo-dbg packages to README.debug. + LP: #872050. + * Disable some tests (no feedback from porters): + - test_socket on hurd-i386. + - test_io on amd64. + - test_signal on kfreebsd-*. Closes: #654783. + - test_threading on sparc. + * Tighten build dependency on libexpat-dev. Closes: #665346. + * Build-depend on db-5.1, don't care about testsuite regressions on + some esoteric ports. If packages rely on threaded applications or + transactions, please use the python-bsddb3 package. + Closes: #621374. + * Don't ship the python2 and python2-config symlinks, move these + to the python-minimal and python-dev packages. Closes: #663874. + * Remove PVER-doc.doc-base.PVER-doc.in. Closes: #656763. + * Update symbols files. + * Avoid runtime path for the sqlite extension. + * CVE-2011-4944, distutils creates ~/.pypirc insecurely. Closes: #650555. + * Fix issue #14505, file descriptor leak when deallocating file objects + created with PyFile_FromString(). Closes: #664529. + + -- Matthias Klose Thu, 05 Apr 2012 15:47:03 +0200 + +python2.7 (2.7.3~rc2-1) unstable; urgency=low + + * Python 2.7.3 release candidate 2. + * Build-depend on expat >= 2.1~. + + -- Matthias Klose Wed, 21 Mar 2012 05:21:47 +0100 + +python2.7 (2.7.3~rc1-1) unstable; urgency=low + + * Python 2.7.3 release candidate 1. + * Update to 20120309, taken from the 2.7 branch. + * Fix dangling libpython.a symlink. Closes: #660231. + + -- Matthias Klose Fri, 09 Mar 2012 19:28:43 +0100 + +python2.7 (2.7.2-13) unstable; urgency=low + + * Update to 20120120, taken from the 2.7 branch. + * Remove patch integrated upstream (issue9054.diff). + * Backport Issue #9189 to distutils/sysconfig.py as well. + Closes: #656118. + * Disable test_io on kfreebsd again. Closes: #654783. + * Disable test_bsddb3 tests on kfreebsd again. + + -- Matthias Klose Fri, 20 Jan 2012 16:33:47 +0100 + +python2.7 (2.7.2-12) unstable; urgency=low + + * Run the tests with a script command which doesn't exit immediatly + when stdin is /dev/null (Colin Watson). + + -- Matthias Klose Fri, 13 Jan 2012 11:04:31 +0100 + +python2.7 (2.7.2-11) unstable; urgency=low + + * Don't run the test_site tests when $HOME doesn't exist. + + -- Matthias Klose Wed, 11 Jan 2012 09:19:00 +0100 + +python2.7 (2.7.2-10) unstable; urgency=low + + * Update to 20120110, taken from the 2.7 branch. + * Overwrite some lintian warnings: + - The -dbg interpreters are not unusual. + - The -gdb.py files don't need a python dependency. + - lintian can't handle a whatis entry starting with one word on the line. + * Fix test failures related to distutils debian installation layout. + * Add build-arch/build-indep targets. + * Regenerate Setup and Makefiles after correcting Setup.local. + * profiled-build.diff: Pass PY_CFLAGS instead of CFLAGS for the profiled + build. + * Pass dpkg-buildflags to the build process, and build third party + extensions with these flags. + * Add support to build using -flto (and -g1) on some architectures. + * Disable pgo builds for some architectures (for now, keep just + amd64 armel armhf i386 powerpc ppc64). + * Build-depend on libgdbm-dev to build and run the gdbm tests. + * Build-depend on xvfb to run the tkinter tests. + * python2.7: Provide python2.7-argparse and python-argparse. + * Don't run test_threading on mips/mipsel. + * Run the test_gdb test for the debug build only. + * Add build conflict to python-cxx-dev (pydoc test failures). + * Disable test_ssl certificate check, certificate expired on python.org. + + -- Matthias Klose Tue, 10 Jan 2012 16:44:56 +0100 + +python2.7 (2.7.2-9) unstable; urgency=low + + * Update to 20111217, taken from the 2.7 branch. + + -- Matthias Klose Sat, 17 Dec 2011 17:36:27 +0100 + +python2.7 (2.7.2-8) unstable; urgency=low + + * Update to 20111130, taken from the 2.7 branch. + * New patch, ctypes-arm, allow for ",hard-float" after libc6 in ldconfig -p + output (Loic Minier). LP: #898172. + * debian/rules: Define DPKG_VARS (Alban Browaeys). Closes: #647419). + * Add python-config man page (Johann Felix Soden). Closes: #650181). + + -- Matthias Klose Wed, 30 Nov 2011 19:16:23 +0100 + +python2.7 (2.7.2-7) unstable; urgency=low + + * Adjust patches for removed Lib/plat-linux3. + * Add build conflict to libncurses5-dev, let configure search for + ncurses headers in /usr/include/ncursesw too. + + -- Matthias Klose Wed, 05 Oct 2011 11:30:16 +0200 + +python2.7 (2.7.2-6) unstable; urgency=low + + * Update to 20111004, taken from the 2.7 branch. + * Use the ncursesw include directory when linking with ncursesw. + * Rebuild with libreadline not linked with libncurses*. Closes: #643816. + * Fix typos in the multiprocessing module. Closes: #643856. + + -- Matthias Klose Tue, 04 Oct 2011 16:09:29 +0200 + +python2.7 (2.7.2-5) unstable; urgency=low + + * Update to 20110816, taken from the 2.7 branch. + - Fix issue#12752. LP: #824734. + * Don't run test_threading on the kfreebsd-i386 buildd. + + -- Matthias Klose Tue, 16 Aug 2011 08:33:31 +0200 + +python2.7 (2.7.2-4) unstable; urgency=low + + * Update to 20110803, taken from the 2.7 branch. + * Fix build on s390x. Closes: #636033. + * Use linux-any for some build dependencies. Closes: #634809. + * Revert previous change to treat Linux 3.x as Linux 2. Use the + plat-linux3 directory instead. + + -- Matthias Klose Wed, 03 Aug 2011 12:36:05 +0200 + +python2.7 (2.7.2-3) unstable; urgency=low + + * Update to 20110709, taken from the 2.7 branch. + * Make the conflict against python-profiler a versioned conflict. + * Don't run the bsddb3 tests on kfreebsd-i386. + * Don't add the bsddb multilib path, if already in the standard lib path. + * Treat Linux 3.x as Linux 2. Closes: #633015. + * Assume working semaphores on Linux, don't rely on running kernel + for the check. Closes: #631188. + + -- Matthias Klose Sat, 09 Jul 2011 13:19:47 +0200 + +python2.7 (2.7.2-2) unstable; urgency=low + + * Update to 20110628, taken from the 2.7 branch. + * Add profile/pstats to the python2.7 package, update debian copyright. + * Don't run the bsddb3 tests on kfreebsd-amd64. + * Don't run the benchmark on hurd-i386. + + -- Matthias Klose Tue, 28 Jun 2011 23:05:21 +0200 + +python2.7 (2.7.2-1) unstable; urgency=low + + * Python 2.7.2 release. + + -- Matthias Klose Sun, 12 Jun 2011 21:04:24 +0200 + +python2.7 (2.7.2~rc1-2) unstable; urgency=medium + + * Set pyexpat dummy version string. + + -- Matthias Klose Tue, 31 May 2011 12:05:56 +0200 + +python2.7 (2.7.2~rc1-1) unstable; urgency=low + + * Python 2.7.2 release candidate 1. + * Update libpython symbols file for m68k (Thorsten Glaser). Closes: #627458. + * Apply proposed patch for issue #670664. LP: #357067. + + -- Matthias Klose Mon, 30 May 2011 06:44:23 +0200 + +python2.7 (2.7.1-9) unstable; urgency=low + + * Update to 20110520, taken from the 2.7 branch. + + -- Matthias Klose Fri, 20 May 2011 13:43:12 +0200 + +python2.7 (2.7.1-8) unstable; urgency=low + + * Keep the ssl.PROTOCOL_SSLv2 module constant , just raise an exception + when trying to create a PySSL object. Closes: #623423. + + -- Matthias Klose Wed, 20 Apr 2011 12:31:03 +0200 + +python2.7 (2.7.1-7) unstable; urgency=low + + * Update to 20110419, taken from the 2.7 branch. + * Build without OpenSSL v2 support. Closes: #620581. + * Force linking the curses module against libncursesw. Closes: #622064. + * Link libpython with --whole-archive. Closes: #614711. + * Re-enable running the testsuite during the build. + + -- Matthias Klose Tue, 19 Apr 2011 17:36:56 +0200 + +python2.7 (2.7.1-6) unstable; urgency=low + + * Update to 20110307, taken from the 2.7 branch. + * Disable the profile guided build on ia64, sparc. + + -- Matthias Klose Mon, 07 Mar 2011 02:19:02 +0100 + +python2.7 (2.7.1-5) experimental; urgency=low + + * Update to 20110224, taken from the 2.7 branch. + * Update patches. + * Re-enable profile guided build. + + -- Matthias Klose Thu, 24 Feb 2011 06:01:42 +0100 + +python2.7 (2.7.1-4) experimental; urgency=low + + * Update to 20110119, taken from the 2.7 branch. + + -- Matthias Klose Wed, 19 Jan 2011 04:21:14 +0100 + +python2.7 (2.7.1-3) experimental; urgency=low + + * Do not run test_multiprocessing when running the testsuite. + Fails on armel and powerpc on some buildds. + + -- Matthias Klose Fri, 24 Dec 2010 01:46:55 +0100 + +python2.7 (2.7.1-2) experimental; urgency=low + + * Update to 20101222, taken from the 2.7 branch. + * Re-enable the distutils-sysconfig.diff patch, apparently + lost when updating the patches for 2.7. + * Disable the profiled builds on all architectures. + + -- Matthias Klose Wed, 22 Dec 2010 15:39:48 +0100 + +python2.7 (2.7.1-1) experimental; urgency=low + + * Python 2.7.1 release. + + -- Matthias Klose Sun, 28 Nov 2010 12:05:23 +0100 + +python2.7 (2.7.1~rc1-2) experimental; urgency=low + + * Move the pyconfig.h file into the -min package, required by sysconfig. + Closes: #603237. + + -- Matthias Klose Sun, 14 Nov 2010 09:40:09 +0100 + +python2.7 (2.7.1~rc1-1) experimental; urgency=low + + * Python 2.7.1 release candidate 1. + * Move the Makefile into the -min package, required by sysconfig. + Closes: #603237. + + -- Matthias Klose Sun, 14 Nov 2010 00:33:48 +0100 + +python2.7 (2.7-9) experimental; urgency=low + + * Update to 20101016, taken from the 2.7 branch. + + -- Matthias Klose Sat, 16 Oct 2010 12:46:57 +0200 + +python2.7 (2.7-8) experimental; urgency=low + + * Disabled the profiled build on armel. + + -- Matthias Klose Thu, 23 Sep 2010 15:06:06 +0200 + +python2.7 (2.7-7) experimental; urgency=low + + * Update to 20100922, taken from the 2.7 branch. + * Update GNU/Hurd patches (Pino Toscano). Closes: #597419. + + -- Matthias Klose Wed, 22 Sep 2010 20:35:24 +0200 + +python2.7 (2.7-6) experimental; urgency=low + + * Update to 20100915, taken from the 2.7 branch. + - Fix issue #9729, Unconnected SSLSocket.{send,recv} raises TypeError + (Andrew Bennetts). LP: #637821. + * Add copyright information for expat, libffi and zlib. Addresses: #596276. + * Apply proposed fix for issue 9054, configure --with-system-expat. + * Provide Lib/plat-gnukfreebsd[78] (Jakub Wilk). Addresses: #593818. + + -- Matthias Klose Wed, 15 Sep 2010 17:43:18 +0200 + +python2.7 (2.7-5) experimental; urgency=low + + * Update to 20100829, taken from the 2.7 branch. + * Don't configure --with-system-expat, segfaults the interpreter in the + testsuite. + * Disable more tests on hppa and hurd-i386, which fail on the buildds. + + -- Matthias Klose Sun, 29 Aug 2010 16:22:37 +0200 + +python2.7 (2.7-4) experimental; urgency=low + + * Update to 20100822, taken from the 2.7 branch. + * Fixed in previous 2.7 uploads: Multiple integer overflows in audioop.c + in the audioop module (CVE-2010-1634). + * Fix some lintian warnings. + * Configure --with-system-expat. + + -- Matthias Klose Mon, 23 Aug 2010 13:03:40 +0200 + +python2.7 (2.7-3) experimental; urgency=low + + * Update to 20100807, taken from the 2.7 branch. + * Move '/usr/local/.../dist-packages' before '/usr/lib/.../dist-packages' + in sys.path. Adresses: #588342. + * Fix detection of ffi.h header file. Closes: #591408. + * python2-7-dev: Depend on libssl-dev. LP: #611845. + + -- Matthias Klose Sat, 07 Aug 2010 21:28:04 +0200 + +python2.7 (2.7-2) experimental; urgency=low + + * Complete debug-build.diff, some parts lost in quilt conversion. + * Move the pkgconfig file into the -dev package. + + -- Matthias Klose Tue, 06 Jul 2010 21:07:48 +0200 + +python2.7 (2.7-1) experimental; urgency=low + + * Python 2.7 release. + * Update to 20100706, taken from the trunk. + * Update symbols files. + + -- Matthias Klose Tue, 06 Jul 2010 07:21:23 +0200 + +python2.7 (2.7~rc2-3) experimental; urgency=low + + * Update to 20100703, taken from the trunk. + * Move the _weakrefset module, not extension to -minimal. Closes: #587568. + * Move the sysconfig module to -minimal. Closes: #586113. + * Move the shutil module to python2.6-minimal. Addresses: #587628. + + -- Matthias Klose Sat, 03 Jul 2010 13:27:36 +0200 + +python2.7 (2.7~rc2-2) experimental; urgency=low + + * Fix applying plat-linux2* patches. + * Use the profiled build on armel, sparc and sparc64. + + -- Matthias Klose Tue, 29 Jun 2010 08:04:59 +0200 + +python2.7 (2.7~rc2-1) experimental; urgency=low + + * Python 2.7 release candidate 2. + * Update to 20100628, taken from the trunk. + * Merge packaging changes from python2.6 (2.6.5+20100628-1). + + -- Matthias Klose Tue, 29 Jun 2010 00:57:00 +0200 + +python2.7 (2.7~b1-2) experimental; urgency=low + + * Update to 20100508, taken from the trunk. + + -- Matthias Klose Sat, 08 May 2010 17:34:07 +0200 + +python2.7 (2.7~b1-1) experimental; urgency=low + + * Python 2.7 beta1. + * Update to 20100420, taken from the trunk. + * Update libpython symbols files. + * Apply proposed patch for issue #7332, segfaults in + PyMarshal_ReadLastObjectFromFile in import_submodule. + * Don't build-depend on locales on avr32. Closes: #575144. + + -- Matthias Klose Tue, 20 Apr 2010 23:53:42 +0200 + +python2.7 (2.7~a4-1) experimental; urgency=low + + * Python 2.7 alpha4. + * Update to 20100316, taken from the trunk. + * Point distutils.sysconfig to the system installation. Closes: #573363. + + -- Matthias Klose Tue, 16 Mar 2010 15:45:07 +0100 + +python2.7 (2.7~a3-1) experimental; urgency=low + + * Python 2.7 alpha3. + + -- Matthias Klose Tue, 16 Feb 2010 03:04:01 +0100 + +python2.7 (2.7~a2-1) experimental; urgency=low + + * Python 2.7 alpha2. + + -- Matthias Klose Sat, 16 Jan 2010 14:49:59 +0100 + +python2.6 (2.6.5+20100628-1) unstable; urgency=low + + * Update to 20100614, taken from the 2.6 release branch (r82337). + * Apply plat-linux2- patch for alpha, hppa, mips, mipsel, sparc + and sparc64. + + -- Matthias Klose Mon, 28 Jun 2010 21:26:43 +0200 + +python2.6 (2.6.5+20100626-1) unstable; urgency=low + + * Update to 20100614, taken from the 2.6 release branch (r82245). + * Update libpython symbols files. Closes: #587012. + * Move the logging package and the runpy module to python2.6-minimal. + + -- Matthias Klose Sat, 26 Jun 2010 14:29:41 +0200 + +python2.6 (2.6.5+20100616-1) unstable; urgency=medium + + * Update to 20100614, taken from the 2.6 release branch (r81601). + * Reapply the backport for issue #8233, lost in the conversion to + quilt. + * Disable the profiled build on alpha. + * Make pydoc more robust not to fail on exceptions other than import + exceptions. + * posixmodule: Add flags for statvfs.f_flag to constant list. + + -- Matthias Klose Wed, 16 Jun 2010 07:56:40 +0200 + +python2.6 (2.6.5+20100529-1) unstable; urgency=low + + * Update to 20100529, taken from the 2.6 release branch (r81601). + - Fix issue #5753, CVE-2008-5983 python: untrusted python modules + search path. Closes: #572010. + * Convert internal dpatch system to quilt. + * Build the ossaudio extension on GNU/kFreeBSD. Closes: #574696. + + -- Matthias Klose Sat, 29 May 2010 15:07:51 +0200 + +python2.6 (2.6.5-2) unstable; urgency=low + + * Update libpython symbols files. + * debian/patches/issue8032.dpatch: Update to version from the + trunk. + * Fix issue #8329: Don't return the same lists from select.select + when no fds are changed. + * Fix issue #8310: Allow dis to examine new style classes. + * Fix issues #8279: Fix test_gdb failures. + * Fix issue #8233: When run as a script, py_compile.py optionally + takes a single argument `-`. + * Apply proposed patch for issue #7332, segfaults in + PyMarshal_ReadLastObjectFromFile in import_submodule. + * Don't build-depend on locales on avr32. Closes: #575144. + + -- Matthias Klose Tue, 20 Apr 2010 19:41:36 +0200 + +python2.6 (2.6.5-1ubuntu6) lucid; urgency=low + + * Fix applying patch for issue #8310. + + -- Matthias Klose Fri, 16 Apr 2010 14:20:35 +0200 + +python2.6 (2.6.5-1ubuntu5) lucid; urgency=low + + * Fix issue #8329: Don't return the same lists from select.select + when no fds are changed. + * Fix issue #8310: Allow dis to examine new style classes. + + -- Matthias Klose Thu, 15 Apr 2010 01:21:07 +0200 + +python2.6 (2.6.5-1ubuntu4) lucid; urgency=low + + * debian/patches/issue8032.dpatch: Update to version from the + trunk. Upload for beta2 to avoid apport errors. + - Handle PyFrameObject's: LP: #543624, #548723. + - Detect cycles in object reference graph and add extra + protection: LP: #544823, LP: #552356. + + -- Matthias Klose Thu, 01 Apr 2010 22:53:06 +0200 + +python2.6 (2.6.5-1ubuntu3) lucid; urgency=low + + * debian/patches/issue8140.dpatch: Incomplete patch; regenerate. + * debian/patches/issue8032.dpatch: Update to v4: + - Add support for PySetObject (set/frozenset). + - Add support for PyBaseExceptionObject (BaseException). + - Fix a signed vs unsigned char issue that led to exceptions + in gdb for PyStringObject instances. + - Handle the case of loops in the object reference graph. + - Unit tests for all of the above. + + -- Matthias Klose Wed, 31 Mar 2010 18:52:32 +0200 + +python2.6 (2.6.5-1ubuntu2) lucid; urgency=low + + * Disable profiled build on powerpc. + + -- Matthias Klose Sat, 20 Mar 2010 15:17:18 +0100 + +python2.6 (2.6.5-1ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.5-1). + + -- Matthias Klose Sat, 20 Mar 2010 03:57:17 +0100 + +python2.6 (2.6.5-1) unstable; urgency=low + + * Python 2.6.5 final release. + * Fix issue #4961: Inconsistent/wrong result of askyesno function in + tkMessageBox with Tcl8.5. LP: #462950. + * Issue #8154, fix segfault with os.execlp('true'). LP: #418848. + * Apply proposed patch for issue #8032, gdb7 hooks for debugging. + + -- Matthias Klose Fri, 19 Mar 2010 00:12:55 +0100 + +python2.6 (2.6.5~rc2-2) unstable; urgency=low + + * Add copyright notices for the readline and _ssl extensions. + Closes: #573866. + * Backport issue #8140: Extend compileall to compile single files. + Add -i option. + * Backport issue #6949, build _bsddb extension with db-4.8.x. + + -- Matthias Klose Tue, 16 Mar 2010 03:02:21 +0100 + +python2.6 (2.6.5~rc2-1) unstable; urgency=low + + * Python 2.6.5 release candidate 2. + - Replace the Monty Python audio test file. Closes: #568674. + * Fix build failure on sparc64. Closes: #570845. + + -- Matthias Klose Thu, 11 Mar 2010 16:50:03 +0100 + +python2.6 (2.6.5~rc2-0ubuntu1) lucid; urgency=low + + * Python 2.6.5 release candidate 2. + + -- Matthias Klose Thu, 11 Mar 2010 13:30:19 +0100 + +python2.6 (2.6.4-6ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.4-6). + + -- Matthias Klose Tue, 16 Feb 2010 01:08:50 +0100 + +python2.6 (2.6.4-6) unstable; urgency=low + + * Update to 20100215, taken from the 2.6 release branch. + * python2.6-minimal: Skip moving syssite contents to new location, if + /usr/local/lib/python2.6 cannot be written. Closes: #569532. LP: #338227. + * libpython2.6: Fix symlink in /usr/lib/python2.6/config. LP: #521050. + + -- Matthias Klose Mon, 15 Feb 2010 22:12:18 +0100 + +python2.6 (2.6.4-5ubuntu1) lucid; urgency=low + + * Merge with Debian (2.6.4-5). + + -- Matthias Klose Sun, 31 Jan 2010 22:31:41 +0100 + +python2.6 (2.6.4-5) unstable; urgency=low + + * Update to 20100131, taken from the 2.6 release branch. + - Fix typo in os.execvp docstring. Closes: #558764. + * distutils.sysconfig.get_python_lib(): Only return ".../dist-packages" if + prefix is the default prefix and if PYTHONUSERBASE is not set in the + environment and if --user option is not present. LP: #476005. + * distutils install: Don't install into /usr/local/local, if option + --prefix=/usr/local is present, without changing the install prefix. + LP: #510211. + + -- Matthias Klose Sun, 31 Jan 2010 21:16:51 +0100 + +python2.6 (2.6.4-4ubuntu1) lucid; urgency=low + + * Update to 20100122, taken from the 2.6 release branch. + - Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). + Closes: #566233. + - Fix typo in os.execvp docstring. Closes: #558764. + * python2.6-doc: Fix searching in local documentation. LP: #456025. + * Update locale module from the trunk. LP: #223281. + * Merge with Debian (2.6.4-4). + + -- Matthias Klose Fri, 22 Jan 2010 11:37:29 +0100 + +python2.6 (2.6.4-4) unstable; urgency=low + + * Update to 20100122, taken from the 2.6 release branch. + - Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). + Closes: #566233. + * Hurd fixes (Pino Toscano). Closes: #565693: + - hurd-broken-poll.dpatch: ported from 2.5. + - hurd-disable-nonworking-constants.dpatch: disable a few constants from + the public API whose C counterparts are not implemented, so using them + either always blocks or always fails (caused issues in the test suite). + - Exclude the profiled build for hurd. + - Disable four blocking tests from the test suite. + + -- Matthias Klose Fri, 22 Jan 2010 11:10:41 +0100 + +python2.6 (2.6.4-3) unstable; urgency=low + + * Disable the profiled build on s390, mips, mipsel. + * Fix symbol files for kfreebsd-amd64 and sparc64. + + -- Matthias Klose Sat, 16 Jan 2010 16:12:17 +0100 + +python2.6 (2.6.4-2) unstable; urgency=low + + * Update to 20100116, taken from the 2.6 release branch. + * Fix bashism in makesetup shell script. Closes: #530170, #530171. + * Fix build issues on avr (Bradley Smith). Closes: #528439. + - Configure --without-ffi. + - Don't run lengthly tests. + * locale.py: Update locale aliases from the 2.7 branch. + + -- Matthias Klose Sat, 16 Jan 2010 11:05:12 +0100 + +python2.6 (2.6.4-1) experimental; urgency=low + + * Python 2.6.4 final release. + - Issue #7120: logging: Removed import of multiprocessing which is causing + crash in GAE. + - Issue #7149: fix exception in urllib when detecting proxy settings + on OSX. + - Issue #7115: Fixed the extension module builds that is failing when + using paths in the extension name instead of dotted names. LP: #449734. + - Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" + environment. + - Issue #7052: Removed nonexisting NullHandler from logging.__all__. + - Issue #7039: Fixed distutils.tests.test_sysconfig when running on + installation with no build. + - Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + * distutils install: Don't install into /usr/local/local, if option + --prefix=/usr/local is present. + + -- Matthias Klose Tue, 27 Oct 2009 01:22:21 +0100 + +python2.6 (2.6.4~rc1-1) experimental; urgency=low + + * Python 2.6.4 release candidate 1. + - Issue #7052: Removed nonexisting NullHandler from logging.__all__. + - Issue #7039: Fixed distutils.tests.test_sysconfig when running on + installation with no build. + - Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + - Issue #7068: Fixed the partial renaming that occured in r72594. + - Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6. + * Remove the conflict with python-setuptools (fixed in issue #7068). + * Build _hashlib as a builtin. + * python2.6-doc: Don't compress the sphinx inventory. + * python2.6-doc: Fix jquery.js symlink. + + -- Matthias Klose Sat, 10 Oct 2009 10:21:02 +0200 + +python2.6 (2.6.3-1) experimental; urgency=low + + * Final Python 2.6.3 release. + - Issue #5329: Fix os.popen* regression from 2.5 with commands as a + sequence running through the shell. + - Issue #6990: Fix threading.local subclasses leaving old state around + after a reference cycle GC which could be recycled by new locals. + - Issue #6790: Make it possible again to pass an `array.array` to + `httplib.HTTPConnection.send`. + - Issue #6922: Fix an infinite loop when trying to decode an invalid + UTF-32 stream with a non-raising error handler like "replace" or + "ignore". + - Issue #1590864: Fix potential deadlock when mixing threads and fork(). + - Issue #6844: Do not emit DeprecationWarnings when accessing a "message" + attribute on exceptions that was set explicitly. + - Issue #6236, #6348: Fix various failures in the `io` module under AIX + and other platforms, when using a non-gcc compiler. Patch by egreen. + - Issue #6851: Fix urllib.urlopen crash on secondairy threads on OSX 10.6 + - Issue #6947: Fix distutils test on windows. Patch by Hirokazu Yamamoto. + - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...) + does now always result in NULL. + - Issue #5042: ctypes Structure sub-subclass does now initialize + correctly with base class positional arguments. + - Issue #6938: Fix a TypeError in string formatting of a multiprocessing + debug message. + - Issue #6944: Fix a SystemError when socket.getnameinfo() was called + with something other than a tuple as first argument. + - Issue #6980: Fix ctypes build failure on armel-linux-gnueabi with + -mfloat-abi=softfp. + * python2.6-dbg: Don't create debug subdirectory in /usr/local. No + separate debug directory needed anymore. + * Run the benchmark with -C 2 -n 5 -w 4 on all architectures. + * Build-depend on the versioned db4.x-dev to avoid unexpected updates + for anydbm databases. + + -- Matthias Klose Sat, 03 Oct 2009 13:19:56 +0200 + +python2.6 (2.6.2-3) experimental; urgency=low + + * Update to 20090919, taken from the 2.6 release branch. + * Add a conflict to python-setuptools (<< 0.6c9-3), C extension + builds broken. + * Add new symbols for update from the branch. + + -- Matthias Klose Sat, 19 Sep 2009 10:36:34 +0200 + +python2.6 (2.6.2-2) experimental; urgency=low + + * Symbol _Py_force_double@Base is i386 only. Closes: #534208. + + -- Matthias Klose Tue, 23 Jun 2009 06:14:40 +0200 + +python2.6 (2.6.2-1) experimental; urgency=low + + * Final Python 2.6.2 release. + - Update Doc/tools/sphinxext/download.html. Closes: #526797. + * Update to 20090621, taken from the 2.6 release branch. + + * Address issues when working with PYTHONUSERBASE and non standard prefix + (pointed out by Larry Hastings): + - distutils.sysconfig.get_python_lib(): Only return ".../dist-packages" if + prefix is the default prefix and if PYTHONUSERBASE is not set in the + environment. + - site.addusersitepackages(): Add USER_BASE/.../dist-packages to sys.path. + * Always use the `unix_prefix' scheme for setup.py install in a virtualenv + setup. LP: #339904. + * Don't make the setup.py install options --install-layout=deb and --prefix + conflict with each other. + * distutils: Always install into `/usr/local/lib/python2.6/dist-packages' + if an option `--prefix=/usr/local' is present (except for virtualenv + and PYTHONUSERBASE installations). LP: #362570. + * Always use `site-packages' as site directory name in virtualenv. + + * Do not add /usr/lib/pythonXY.zip on sys.path. + * Add symbols files for libpython2.6 and python2.6-dbg, don't include symbols + from builtins, which can either be built as builtins or extensions. + * Keep an empty lib-dynload in python2.6-minimal to avoid a warning on + startup. + * Build a shared library configured --with-pydebug. LP: #322580. + * Fix some lintian warnings. + * Use the information in /etc/lsb-release for platform.dist(). LP: #196526. + * Move the bdist_wininst files into the -dev package (only needed to build + windows installers). + * Document changes to the site directory name in the installation manual. + * Fix issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add + `do { ... } while (0)' to avoid compiler warnings. Closes: #516956. + * debian/pyhtml2devhelp.py: update for python 2.6 (Marc Deslauriers). + * debian/rules: re-enable documentation files for devhelp. LP: #338791. + * python2.6-doc: Depend on libjs-jquery, use jquery.js from this package. + Closes: #523482. + + -- Matthias Klose Sun, 21 Jun 2009 16:12:15 +0200 + +python2.6 (2.6.1-3) experimental; urgency=low + + * Update to 20090318, taken from the 2.6 release branch. + * Use the information in /etc/lsb-release for platform.dist(). + * Update installation schemes: LP: #338395. Closes: #520278. + - When the --prefix option is used for setup.py install, Use the + `unix_prefix' scheme. + - Use the `deb_system' scheme if --install-layout=deb is specified. + - Use the the `unix_local' scheme if neither --install-layout=deb + nor --prefix is specified. + - The options --install-layout=deb and --prefix are exclusive. + * Don't fail installation/removal if directories in /usr/local cannot + be created. LP: #338227. + * Don't try to move away the site-packages directory. There never was a + python2.6 upload using site-packages. Closes: #518780. + * Fix build failure on mips/mipsel. Closes: #519386. + + -- Matthias Klose Wed, 18 Mar 2009 22:17:20 +0100 + +python2.6 (2.6.1-2) experimental; urgency=low + + * Move libpython2.6.a into the python2.6-dev package. + * Move idlelib into the idle-python2.6 package. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-1) experimental; urgency=low + + * New upstream version, upload to experimental. + * Update to 20090225, taken from the 2.6 release branch. + * Don't build-depend on locales on armel, hppa, ia64 and mipsel; package is + currently not installable. + + -- Matthias Klose Wed, 25 Feb 2009 18:42:19 +0100 + +python2.6 (2.6.1-0ubuntu9) jaunty; urgency=low + + * Don't build pyexpat, _elementtree and _ctypes as builtin extensions, + third party packages make too many assumptions about these not built + as builtins. + + -- Matthias Klose Tue, 24 Feb 2009 16:34:27 +0100 + +python2.6 (2.6.1-0ubuntu8) jaunty; urgency=low + + * Link the shared libpython with $(MODLIBS). + + -- Matthias Klose Sun, 22 Feb 2009 16:38:49 +0100 + +python2.6 (2.6.1-0ubuntu7) jaunty; urgency=low + + * Update to 20090222, taken from the 2.6 release branch. + + -- Matthias Klose Sun, 22 Feb 2009 10:35:29 +0100 + +python2.6 (2.6.1-0ubuntu6) jaunty; urgency=low + + * Don't build the gdbm extension from the python2.6 source. + * Build the dbm extension using libdb. + * Don't build-depend on locales on sparc (currently not installable), only + needed by the testsuite. + * Update to 20090219, taken from the 2.6 release branch. + + -- Matthias Klose Thu, 19 Feb 2009 12:43:20 +0100 + +python2.6 (2.6.1-0ubuntu5) jaunty; urgency=low + + * Add build dependency on libdb-dev. + + -- Matthias Klose Mon, 16 Feb 2009 13:34:41 +0100 + +python2.6 (2.6.1-0ubuntu4) jaunty; urgency=low + + * Disable the profiled build on all architectures. + + -- Matthias Klose Mon, 16 Feb 2009 11:18:51 +0100 + +python2.6 (2.6.1-0ubuntu3) jaunty; urgency=low + + * Disable the profiled build on armel as well. + + -- Matthias Klose Sun, 15 Feb 2009 10:38:02 +0100 + +python2.6 (2.6.1-0ubuntu2) jaunty; urgency=low + + * Don't use the profiled build on amd64, lpia and sparc (GCC + PR profile/38292). + + -- Matthias Klose Sat, 14 Feb 2009 14:09:34 +0100 + +python2.6 (2.6.1-0ubuntu1) jaunty; urgency=low + + * Update to 20090211, taken from the 2.6 release branch. + + -- Matthias Klose Fri, 13 Feb 2009 12:51:00 +0100 + +python2.6 (2.6.1-0ubuntu1~ppa1) jaunty; urgency=low + + * Python 2.6.1 release. + * Update to 20081206, taken from the 2.6 release branch. + * Ensure that all extensions from the -minimal package are statically + linked into the interpreter. + * Include expat, _elementtree, datetime, bisect, _bytesio, _locale, + _fileio in -minimal to link these extensions statically. + + -- Matthias Klose Fri, 05 Dec 2008 20:43:51 +0100 + +python2.6 (2.6-0ubuntu1~ppa5) intrepid; urgency=low + + * Test build + + -- Matthias Klose Fri, 14 Nov 2008 10:14:38 +0100 + +python2.6 (2.6-0ubuntu1~ppa4) intrepid; urgency=low + + * Do not build the bsddb3 module from this source, but recommend the + python-bsddb3 package (will be a dependency after python-bsddb3 is in + the archive). + * For locally installed packages, create a directory + /usr/local/lib/python2.6/dist-packages. This is the default for + installations done with distutils and setuptools. Third party stuff + packaged within the distribution goes to /usr/lib/python2.6/dist-packages. + There is no /usr/lib/python2.6/site-packages in the file system and + on sys.path. No package within the distribution must not install + anything in this location. + * Place the gdbm extension into the python2.6 package. + * distutils: Add an option --install-layout=deb, which + - installs into $prefix/dist-packages instead of $prefix/site-packages. + - doesn't encode the python version into the egg name. + + -- Matthias Klose Sat, 25 Oct 2008 11:12:24 +0000 + +python2.6 (2.6-0ubuntu1~ppa3) intrepid; urgency=low + + * Build-depend on libdb4.6-dev, instead of libdb-dev (4.7). Test suite + hangs in the bsddb tests. + + -- Matthias Klose Wed, 22 Oct 2008 11:05:13 +0200 + +python2.6 (2.6-0ubuntu1~ppa2) intrepid; urgency=low + + * Update to 20081021, taken from the 2.6 release branch. + * Fix typos and section names in doc-base files. LP: #273344. + * Build a new package libpython2.6. + * For locally installed packages, create a directory + /usr/local/lib/python2.6/system-site-packages, which is symlinked + from /usr/lib/python2.6/site-packages. Third party stuff packaged + within the distribution goes to /usr/lib/python2.6/dist-packages. + + -- Matthias Klose Tue, 21 Oct 2008 18:09:31 +0200 + +python2.6 (2.6-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 release. + * Update to current branch 20081009. + + -- Matthias Klose Thu, 09 Oct 2008 14:28:26 +0200 + +python2.6 (2.6~b3-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta3 release. + + -- Matthias Klose Sun, 24 Aug 2008 01:34:54 +0000 + +python2.6 (2.6~b2-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta2 release. + + -- Matthias Klose Thu, 07 Aug 2008 16:45:56 +0200 + +python2.6 (2.6~b1-0ubuntu1~ppa1) intrepid; urgency=low + + * Python 2.6 beta1 release. + + -- Matthias Klose Tue, 15 Jul 2008 12:57:20 +0000 + +python2.6 (2.6~a3-0ubuntu1~ppa2) hardy; urgency=low + + * Test build + + -- Matthias Klose Thu, 29 May 2008 18:08:48 +0200 + +python2.6 (2.6~a3-0ubuntu1~ppa1) hardy; urgency=low + + * Python 2.6 alpha3 release. + * Update to current trunk 20080523. + + -- Matthias Klose Thu, 22 May 2008 17:37:46 +0200 + +python2.5 (2.5.2-5) unstable; urgency=low + + * Backport new function signal.set_wakeup_fd from the trunk. + Background: http://bugzilla.gnome.org/show_bug.cgi?id=481569 + + -- Matthias Klose Wed, 30 Apr 2008 12:05:10 +0000 + +python2.5 (2.5.2-4) unstable; urgency=low + + * Update to 20080427, taken from the 2.5 release branch. + - Fix issues #2670, #2682. + * Disable running pybench on the hppa buildd (ftbfs). + * Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, + CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + * Support parallel= in DEB_BUILD_OPTIONS (see #209008). + + -- Matthias Klose Sun, 27 Apr 2008 10:40:51 +0200 + +python2.5 (2.5.2-3) unstable; urgency=medium + + * Update to 20080416, taken from the 2.5 release branch. + - Fix CVE-2008-1721, integer signedness error in the zlib extension module. + - Fix urllib2 file descriptor happens byte-at-a-time, reverting + a fix for excessively large memory allocations when calling .read() + on a socket object wrapped with makefile(). + * Disable some regression tests on some architectures: + - arm: test_compiler, test_ctypes. + - armel: test_compiler. + - hppa: test_fork1, test_wait3. + - m68k: test_bsddb3, test_compiler. + * Build-depend on libffi-dev instead of libffi4-dev. + * Fix CVE-2008-1679, integer overflows in the imageop module. + + -- Matthias Klose Wed, 16 Apr 2008 23:37:46 +0200 + +python2.5 (2.5.2-2) unstable; urgency=low + + * Use site.addsitedir() to add directories in /usr/local to sys.path. + Addresses: #469157, #469818. + + -- Matthias Klose Sat, 08 Mar 2008 16:11:23 +0100 + +python2.5 (2.5.2-1) unstable; urgency=low + + * Python 2.5.2 release. + * Merge from Ubuntu: + - Move site customization into sitecustomize.py, don't make site.py + a config file. Addresses: #309719, #413172, #457361. + - Move site.py to python2.4-minimal, remove `addbuilddir' from site.py, + which is unnecessary for installed builds. + - python2.5-dev: Recommend libc-dev instead of suggesting it. LP: #164909. + - Fix issue 961805, Tk Text.edit_modified() fails. LP: #84720. + + -- Matthias Klose Thu, 28 Feb 2008 23:18:52 +0100 + +python2.5 (2.5.1-7) unstable; urgency=low + + * Update to 20080209, taken from the 2.5 release branch. + * Build the _bsddb extension with db-4.5 again; 4.6 is seriously + broken when used with the _bsddb extension. + * Do not run pybench on arm and armel. + * python2.5: Provide python2.5-wsgiref. + * Fix a pseudo RC report with duplicated attributes in the control + file. Closes: #464307. + + -- Matthias Klose Sun, 10 Feb 2008 00:22:57 +0100 + +python2.5 (2.5.1-6) unstable; urgency=low + + * Update to 20080102, taken from the 2.5 release branch. + - Only define _BSD_SOURCE on OpenBSD systems. Closes: #455400. + * Fix handling of packages in linecache.py (Kevin Goodsell). LP: #70902. + * Bump debhelper to v5. + * Register binfmt for .py[co] files. + * Use absolute paths when byte-compiling files. Addresses: #453346. + Closes: #413566, LP: #177722. + * CVE-2007-4965, http://bugs.python.org/issue1179: + Multiple integer overflows in the imageop module in Python 2.5.1 and + earlier allow context-dependent attackers to cause a denial of service + (application crash) and possibly obtain sensitive information (memory + contents) via crafted arguments to (1) the tovideo method, and unspecified + other vectors related to (2) imageop.c, (3) rbgimgmodule.c, and other + files, which trigger heap-based buffer overflows. + Patch prepared by Stephan Herrmann. Closes: #443333, LP: #163845. + * Register info docs when doing source only uploads. LP: #174786. + * Remove deprecated value from categories in desktop file. LP: #172874. + * python2.5-dbg: Don't include the gdbm and _tkinter extensions, now provided + in separate packages. + * Provide a symlink changelog -> NEWS. Closes: #439271. + * Fix build failure on hurd, working around poll() on systems on which it + returns an error on invalid FDs. Closes: #438914. + * Configure --with-system-ffi on all architectures. Closes: #448520. + * Fix version numbers in copyright and README files (Dan O'Huiginn). + Closes: #446682. + * Move some documents from python2.5 to python2.5-dev. + + -- Matthias Klose Wed, 02 Jan 2008 22:22:19 +0100 + +python2.5 (2.5.1-5) unstable; urgency=low + + * Build the _bsddb extension with db-4.6. + + -- Matthias Klose Fri, 17 Aug 2007 00:39:35 +0200 + +python2.5 (2.5.1-4) unstable; urgency=low + + * Update to 20070813, taken from the 2.5 release branch. + * Include plat-mac/plistlib.py (plat-mac is not in sys.path by default. + Closes: #435826. + * Use emacs22 to build the documentation in info format. Closes: #434969. + * Build-depend on db-dev (>= 4.6). Closes: #434965. + + -- Matthias Klose Mon, 13 Aug 2007 22:22:44 +0200 + +python2.5 (2.5.1-3) unstable; urgency=high + + * Support mixed-endian IEEE floating point, as found in the ARM old-ABI + (Aurelien Jarno). Closes: #434905. + + -- Matthias Klose Fri, 27 Jul 2007 20:01:35 +0200 + +python2.5 (2.5.1-2) unstable; urgency=low + + * Update to 20070717, taken from the 2.5 release branch. + * Fix reference count for sys.pydebug variable. Addresses: #431393. + * Build depend on libbluetooth-dev instead of libbluetooth2-dev. + + -- Matthias Klose Tue, 17 Jul 2007 14:09:47 +0200 + +python2.5 (2.5.1-1) unstable; urgency=low + + * Python-2.5.1 release. + * Build-depend on gcc-4.1 (>= 4.1.2-4) on alpha, powerpc, s390, sparc. + * Merge from Ubuntu: + - Add debian/patches/subprocess-eintr-safety.dpatch (LP: #87292): + - Create and use wrappers around read(), write(), and os.waitpid() in the + subprocess module which retry the operation on an EINTR (which happens + if e. g. an alarm was raised while the system call was in progress). + It is incredibly hard and inconvenient to sensibly handle this in + applications, so let's fix this at the right level. + - Patch based on original proposal of Peter <85>strand + in http://python.org/sf/1068268. + - Add two test cases. + - Change the interpreter to build and install python extensions + built with the python-dbg interpreter with a different name into + the same path (by appending `_d' to the extension name). The debug build + of the interpreter tries to first load a foo_d.so or foomodule_d.so + extension, then tries again with the normal name. + - When trying to import the profile and pstats modules, don't + exit, add a hint to the exception pointing to the python-profiler + package, don't exit. + - Keep the module version in the .egg-info name, only remove the + python version. + - python2.5-dbg: Install Misc/SpecialBuilds.txt, document the + debug changes in README.debug. + * Update to 20070425, taken from the 2.5 release branch. + + -- Matthias Klose Wed, 25 Apr 2007 22:12:50 +0200 + +python2.5 (2.5-6) unstable; urgency=medium + + * webbrowser.py: Recognize other browsers: www-browser, x-www-browser, + iceweasel, iceape. + * Move pyconfig.h from the python2.5-dev into the python2.5 package; + required by builds for pure python modules without having python2.5-dev + installed (matching the functionality in python2.4). + * Move the unicodedata module into python2.5-minimal; allows byte compilation + of UTF8 encoded files. + * Do not install anymore outdated debhelper sample scripts. + * Install Misc/SpecialBuilds.txt as python2.5-dbg document. + + -- Matthias Klose Wed, 21 Feb 2007 01:17:12 +0100 + +python2.5 (2.5-5) unstable; urgency=high + + * Do not run the python benchmark on m68k. Timer problems. + Fixes FTBFS on m68k. + * Update to 20061209, taken from the 2.5 release branch. + - Fixes building the library reference in info format. + + -- Matthias Klose Sat, 9 Dec 2006 13:40:48 +0100 + +python2.5 (2.5-4) unstable; urgency=medium + + * Update to 20061203, taken from the 2.5 release branch. + - Fixes build failures on knetfreebsd and the hurd. Closes: #397000. + * Clarify README about distutils. Closes: #396394. + * Move python2.5-config to python2.5-dev. Closes: #401451. + * Cleanup build-conflicts. Addresses: #394512. + + -- Matthias Klose Sun, 3 Dec 2006 18:22:49 +0100 + +python2.5 (2.5-3.1) unstable; urgency=low + + * Non-maintainer upload. + * python2.5-minimal depends on python-minimal (>= 2.4.4-1) because it's the + first version which lists python2.5 as an unsupported runtime (ie a + runtime that is available but for which modules are not auto-compiled). + And being listed there is required for python-central to accept the + installation of python2.5-minimal. Closes: #397006 + + -- Raphael Hertzog Wed, 22 Nov 2006 15:41:06 +0100 + +python2.5 (2.5-3) unstable; urgency=medium + + * Update to 20061029 (2.4.4 was released on 20061019), taken from + the 2.5 release branch. We do not want to have regressions in + 2.5 compared to the 2.4.4 release. + * Don't run pybench on m68k, fails in the calibration loop. Closes: #391030. + * Run the installation/removal hooks. Closes: #383292, #391036. + + -- Matthias Klose Sun, 29 Oct 2006 11:35:19 +0100 + +python2.5 (2.5-2) unstable; urgency=medium + + * Update to 20061003, taken from the 2.5 release branch. + * On arm and m68k, don't run the pybench in debug mode. + * Fix building the source within exec_prefix (Alexander Wirt). + Closes: #385336. + + -- Matthias Klose Tue, 3 Oct 2006 10:08:36 +0200 + +python2.5 (2.5-1) unstable; urgency=low + + * Python 2.5 release. + * Update to 20060926, taken from the 2.5 release branch. + * Run the Python benchmark during the build, compare the results + of the static and shared builds. + * Fix invalid html in python2.5.devhelp.gz. + * Add a python2.5 console entry to the menu (hidden by default). + * python2.5: Suggest python-profiler. + + -- Matthias Klose Tue, 26 Sep 2006 02:36:11 +0200 + +python2.5 (2.5~c1-1) unstable; urgency=low + + * Python 2.5 release candidate 1. + * Update to trunk 20060818. + + -- Matthias Klose Sat, 19 Aug 2006 19:21:05 +0200 + +python2.5 (2.5~b3-1) unstable; urgency=low + + * Build the _ctypes module for m68k-linux. + + -- Matthias Klose Fri, 11 Aug 2006 18:19:19 +0000 + +python2.5 (2.5~b3-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta3 release. + * Update to trunk 20060811. + * Rebuild the documentation. + * Fix value of sys.exec_prefix in the debug build. + * Do not build the library reference in info format; fails to build. + * Link the interpreter against the shared runtime library. With + gcc-4.1 the difference in the pystones benchmark dropped from about + 12% to about 6%. + * Install the statically linked version of the interpreter as + python2.5-static for now. + * Link the shared libpython with -O1. + + -- Matthias Klose Thu, 10 Aug 2006 14:04:48 +0000 + +python2.5 (2.4.3+2.5b2-3) unstable; urgency=low + + * Disable the testsuite on s390; don't care about "minimally configured" + buildd's. + + -- Matthias Klose Sun, 23 Jul 2006 11:45:03 +0200 + +python2.5 (2.4.3+2.5b2-2) unstable; urgency=low + + * Update to trunk 20060722. + * Merge idle-lib from idle-python2.5 into python2.5. + * Merge lib-tk from python-tk into python2.5. + * Tkinter.py: Suggest installation of python-tk package on failed + import of the _tkinter extension. + * Don't run the testsuite for the debug build on alpha. + * Don't run the test_compiler test on m68k. Just takes too long. + * Disable building ctypes on m68k (requires support for closures). + + -- Matthias Klose Sat, 22 Jul 2006 22:26:42 +0200 + +python2.5 (2.4.3+2.5b2-1) unstable; urgency=low + + * Python 2.5 beta2 release. + * Update to trunk 20060716. + * When built on a buildd, do not run the following test which try to + access the network: test_codecmaps_cn, test_codecmaps_hk, test_codecmaps_jp, + test_codecmaps_kr, test_codecmaps_tw, test_normalization. + * When built on a buildd, do not run tests requiring missing write permissions: + test_ossaudiodev. + + -- Matthias Klose Sun, 16 Jul 2006 02:53:50 +0000 + +python2.5 (2.4.3+2.5b2-0ubuntu1) edgy; urgency=low + + * Python 2.5 beta2 release. + + -- Matthias Klose Thu, 13 Jul 2006 17:16:52 +0000 + +python2.5 (2.4.3+2.5b1-1ubuntu2) edgy; urgency=low + + * Fix python-dev dependencies. + * Update to trunk 20060709. + + -- Matthias Klose Sun, 9 Jul 2006 18:50:32 +0200 + +python2.5 (2.4.3+2.5b1-1ubuntu1) edgy; urgency=low + + * Python 2.5 beta1 release. + * Update to trunk 20060623. + * Merge changes from the python2.4 packages. + * python2.5-minimal: Add _struct. + + -- Matthias Klose Fri, 23 Jun 2006 16:04:46 +0200 + +python2.5 (2.4.3+2.5a1-1) experimental; urgency=low + + * Update to trunk 20060409. + * Run testsuite for debug build as well. + * Build-depend on gcc-4.1. + + -- Matthias Klose Sun, 9 Apr 2006 22:27:05 +0200 + +python2.5 (2.4.3+2.5a1-0ubuntu1) dapper; urgency=low + + * Python 2.5 alpha1 release. + * Drop integrated patches. + * Add build dependencies on libsqlite3-dev and libffi4-dev. + * Add (build-)dependency on mime-support, libgpmg1 (test suite). + * Build using the system FFI. + * python2.5 provides python2.5-ctypes and python2.5-pysqlite2, + python2.5-elementtree. + * Move hashlib.py to python-minimal. + * Lib/hotshot/pstats.py: Error out on missing profile/pstats modules. + + -- Matthias Klose Wed, 5 Apr 2006 14:56:15 +0200 + +python2.4 (2.4.3-8ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. Remaining changes: + - Apply langpack-gettext patch. + - diff.gz contains pregenerated html and info docs. + - Build the -doc package from this source. + + -- Matthias Klose Thu, 22 Jun 2006 18:39:57 +0200 + +python2.4 (2.4.3-8) unstable; urgency=low + + * Remove python2.4's dependency on python-central. On installation of + the runtime, call hooks /usr/share/python/runtime.d/*.rtinstall. + On removal, call hooks /usr/share/python/runtime.d/*.rtremove. + Addresses: #372658. + * Call the rtinstall hooks only, if it's a new installation, or the first + installation using the hooks. Adresses: #373677. + + -- Matthias Klose Sun, 18 Jun 2006 00:56:13 +0200 + +python2.4 (2.4.3-7) unstable; urgency=medium + + * Reupload, depend on python-central (>= 0.4.15). + * Add build-conflict on python-xml. + + -- Matthias Klose Wed, 14 Jun 2006 18:56:57 +0200 + +python2.4 (2.4.3-6) medium; urgency=low + + * idle-python2.4: Remove the old postinst and prerm scripts. + * Name the runtime correctly in python2.4-minimal's installation + scripts. + + -- Matthias Klose Mon, 12 Jun 2006 17:39:56 +0000 + +python2.4 (2.4.3-5) unstable; urgency=low + + * python2.4-prerm: Handle the case, when python-central is not installed. + * idle-python2.4: Depend on python-tk instead of python2.4-tk. + + -- Matthias Klose Fri, 9 Jun 2006 05:17:17 +0200 + +python2.4 (2.4.3-4) unstable; urgency=low + + * SVN update up to 2006-06-07 + * Use python-central. + * Don't build the -tk and -gdbm packages from this source; now built + from the python-stdlib-extensions source. + * Remove leftover build dependency on libgmp3-dev. + * Do not build-depend on libbluetooth1-dev and libgpmg1-dev on + hurd-i386, kfreebsd-i386, kfreebsd-amd64. Closes: #365830. + * Do not run the test_tcl test; hangs for unknown reasons on at least + the following buildds: vivaldi(m68k), goedel (alpha), mayer (mipsel). + And no virtual package to file bug reports for the buildds ... + Closes: #364419. + * Move the Makefile from python2.4-dev to python2.4. Closes: #366473. + * Fix typo in pdb(1). Closes: #365772. + * New autoconf likes the mandir in /usr/share instead of /usr; work + with both locations. Closes: #367618. + + -- Matthias Klose Wed, 7 Jun 2006 21:37:20 +0200 + +python2.4 (2.4.3-3) unstable; urgency=low + + * SVN update up to 2006-04-21 + * Update locale aliases from /usr/share/X11/locale/locale.alias. + * Start idle with option -n from the desktop menu, so that the program + can be started in parallel. + * Testsuite related changes only: + - Add build dependencies mime-support, libgpmg1 (needed by test cases). + - Run the testsuite with bsddb, audio and curses resources enabled. + - Re-run the failed tests in verbose mode. + - Run the test suite for the debug build as well. + - Build depend on netbase, needed by test_socketmodule. + - Build depend on libgpmg1, needed by test_curses. + - On the buildds do not run the tests needing the network resource. + * Update python logo. + * Check for the availability of the profile and pstats modules when + importing hotshot.pstats. Closes: #334067. + * Don't build the -doc package from the python2.4 source. + * Set OPT in the installed Makefile to -O2. + + -- Matthias Klose Fri, 21 Apr 2006 19:58:43 +0200 + +python2.4 (2.4.3-2) unstable; urgency=low + + * Add (build-)dependency on mime-support. + + -- Matthias Klose Tue, 4 Apr 2006 22:21:41 +0200 + +python2.4 (2.4.3-1) unstable; urgency=low + + * Python 2.4.3 release. + + -- Matthias Klose Thu, 30 Mar 2006 23:42:37 +0200 + +python2.4 (2.4.3-0ubuntu1) dapper; urgency=low + + * Python 2.4.3 release. + - Fixed a bug that the gb18030 codec raises RuntimeError on encoding + surrogate pair area on UCS4 build. Ubuntu: #29289. + + -- Matthias Klose Thu, 30 Mar 2006 10:57:32 +0200 + +python2.4 (2.4.2+2.4.3c1-0ubuntu1) dapper; urgency=low + + * SVN update up to 2006-03-25 (2.4.3 candidate 1). + - Regenerate the documentation. + + -- Matthias Klose Mon, 27 Mar 2006 12:03:05 +0000 + +python2.4 (2.4.2-1ubuntu3) dapper; urgency=low + + * SVN update up to 2006-03-04 + - Regenerate the documentation. + - map.mmap(-1, size, ...) can return anonymous memory again on Unix. + Ubuntu #26201. + * Build-depend on libncursesw5-dev, ncursesw5 is preferred for linking. + Provides UTF-8 compliant curses bindings. + * Fix difflib where certain patterns of differences were making difflib + touch the recursion limit. + + -- Matthias Klose Sat, 4 Mar 2006 21:38:24 +0000 + +python2.4 (2.4.2-1ubuntu2) dapper; urgency=low + + * SVN update up to 2006-01-17 + - pwd is now a builtin module, remove it from python-minimal. + - Regenerate the documentation. + * python2.4-tk: Suggest tix instead of tix8.1. + * Move config/Makefile from the -dev package into the runtime package + to be able to use the bdist_wininst distutils command. Closes: #348335. + + -- Matthias Klose Tue, 17 Jan 2006 11:02:24 +0000 + +python2.4 (2.4.2-1ubuntu1) dapper; urgency=low + + * Temporarily remove build dependency on lsb-release. + + -- Matthias Klose Sun, 20 Nov 2005 17:40:18 +0100 + +python2.4 (2.4.2-1build1) dapper; urgency=low + + * Rebuild (openssl-0.9.8). + + -- Matthias Klose Sun, 20 Nov 2005 15:27:24 +0000 + +python2.4 (2.4.2-1) unstable; urgency=low + + * Python 2.4.2 release. + + -- Matthias Klose Thu, 29 Sep 2005 01:49:28 +0200 + +python2.4 (2.4.1+2.4.2rc1-1) unstable; urgency=low + + * Python 2.4.2 release candidate 1. + * Fix "Fatal Python error" from cStringIO's writelines. + Patch by Andrew Bennetts. + + -- Matthias Klose Thu, 22 Sep 2005 10:33:22 +0200 + +python2.4 (2.4.1-5) unstable; urgency=low + + * CVS update up to 2005-09-14 + - Regenerate the html and info docs. + * Add some more locale aliases. + * Fix substitution pf python version in README.python2.4-minimal. + Closes: #327487. + * On m68k, build using -O2 (closes: #326903). + * On Debian, don't configure --with-fpectl, which stopped working with + glibc-2.3.5. + + -- Matthias Klose Wed, 14 Sep 2005 17:32:56 +0200 + +python2.4 (2.4.1-4) unstable; urgency=low + + * CVS update up to 2005-09-04 + - teTeX 3.0 related fixes (closes: #322407). + - Regenerate the html and info docs. + * Add entry for IDLE in the Gnome menus. + * Don't build-depend on libbluetooth-dev on the Hurd (closes: #307037). + * Reenable the cthreads patch for the Hurd (closes: #307052). + + -- Matthias Klose Sun, 4 Sep 2005 18:31:42 +0200 + +python2.4 (2.4.1-3) unstable; urgency=low + + * Synchronise with Ubuntu: + - Build a python2.4-minimal package. + + -- Matthias Klose Tue, 12 Jul 2005 00:23:10 +0000 + +python2.4 (2.4.1-2ubuntu3) breezy; urgency=low + + * CVS update up to 2005-07-07 + * Regenerate the documentation. + + -- Matthias Klose Thu, 7 Jul 2005 09:21:28 +0200 + +python2.4 (2.4.1-2ubuntu2) breezy; urgency=low + + * CVS update up to 2005-06-15 + * Regenerate the documentation. + * Synchronize with Debian. Ubuntu 10485. + * idle-python2.4 enhances python2.4. Ubuntu 11562. + * README.Debian: Fix reference to the doc directory (closes: #311677). + + -- Matthias Klose Wed, 15 Jun 2005 08:56:57 +0200 + +python2.4 (2.4.1-2ubuntu1) breezy; urgency=low + + * Update build dependencies: + db4.2-dev -> db4.3-dev, + libreadline4-dev -> libreadline5-dev. + * python2.4-dev: Add missing templates to generate HTML docs. Ubuntu 11531. + + -- Matthias Klose Sun, 29 May 2005 00:01:05 +0200 + +python2.4 (2.4.1-2) unstable; urgency=low + + * Add the debug symbols for the python2.4, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. + * Add gdbinit example to doc directory. + + -- Matthias Klose Thu, 5 May 2005 11:12:32 +0200 + +python2.4 (2.4.1-1ubuntu2) breezy; urgency=low + + * Add the debug symbols for the python2.4, python2.4-minimal, python2.4-gdbm + and python2.4-tk packages to the python2.4-dbg package. Ubuntu 10261, + * Add gdbinit example to doc directory. + * For os.utime, use utimes(2), correctly working with glibc-2.3.5. + Ubuntu 10294. + + -- Matthias Klose Thu, 5 May 2005 09:06:07 +0200 + +python2.4 (2.4.1-1ubuntu1) breezy; urgency=low + + * Reupload as 2.4.1-1ubuntu1. + + -- Matthias Klose Thu, 14 Apr 2005 10:46:32 +0200 + +python2.4 (2.4.1-1) unstable; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 19:42:03 +0200 + +python2.4 (2.4.1-0) hoary; urgency=low + + * Python 2.4.1 release. + * Fix noise in python-doc installation/removal. + * New Python section for the info docs. + + -- Matthias Klose Wed, 30 Mar 2005 16:35:34 +0200 + +python2.4 (2.4+2.4.1rc2-2) unstable; urgency=low + + * Add the valgrind support file to /etc/python2.4 + * Build the -dbg package with -DPy_USING_MEMORY_DEBUGGER. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * Fix two typos in python(1). Addresses: #300124. + + -- Matthias Klose Sat, 19 Mar 2005 21:50:14 +0100 + +python2.4 (2.4+2.4.1rc2-1) unstable; urgency=low + + * Python 2.4.1 release candidate 2. + * Build-depend on libbluetooth1-dev. + + -- Matthias Klose Sat, 19 Mar 2005 00:57:14 +0100 + +python2.4 (2.4dfsg-2) unstable; urgency=low + + * CVS update up to 2005-03-03 + + -- Matthias Klose Thu, 3 Mar 2005 22:22:16 +0100 + +python2.4 (2.4dfsg-1ubuntu4) hoary; urgency=medium + + * Move exception finalisation later in the shutdown process - this + fixes the crash seen in bug #1165761, taken from CVS. + * codecs.StreamReader: Reset codec when seeking. Ubuntu #6972. + * Apply fix for SF1124295, fixing an obscure bit of Zope's security machinery. + * distutils: Don't add standard library dirs to library_dirs + and runtime_library_dirs. On amd64, runtime paths pointing to /usr/lib64 + aren't recognized by dpkg-shlibdeps, and the packages containing these + libraries aren't added to ${shlibs:Depends}. + * Lib/locale.py: + - correctly parse LANGUAGE as a colon separated list of languages. + - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct + encoding. + - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding + for glibc. + * os.py: Avoid using items() in environ.update(). Fixes #1124513. + * Python/pythonrun.c: + * Build depend on locales, generate the locales needed for the + testsuite. + * Add build dependency on libbluetooth1-dev, adding some bluetooth + functionality to the socket module. + * Lib/test/test_sundry.py: Don't fail on import of profile & pstats, + which are separated out to the python-profiler package. + * Fix typos in manpage. + + -- Matthias Klose Tue, 29 Mar 2005 13:35:53 +0200 + + +python2.4 (2.4dfsg-1ubuntu3) hoary; urgency=low + + * debian/patches/langpack-gettext.dpatch: + - langpack support for python-gettext added + + -- Michael Vogt Tue, 1 Mar 2005 13:13:36 +0100 + +python2.4 (2.4dfsg-1ubuntu2) hoary; urgency=low + + * Revert 'essential' status on python2.4-minimal. This status on + on python-minimal is sufficient (Ubuntu #6392). + + -- Matthias Klose Wed, 9 Feb 2005 23:09:42 +0100 + +python2.4 (2.4dfsg-1ubuntu1) hoary; urgency=low + + * Resyncronise with Debian. + * Mark the python2.4-minimal package as 'essential'. + + -- Matthias Klose Wed, 9 Feb 2005 13:31:09 +0100 + +python2.4 (2.4dfsg-1) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Remove the profile.py and pstats.py modules from the source package, + not having a DFSG conforming license. The modules can be found in + the python2.x-profile package in the non-free section. + Addresses: #293932. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7ubuntu1) hoary; urgency=low + + * Fix the name of the python-dbg man page. + * Resyncronise with Debian. + * Move more modules to -minimal (new code in copy.py requires these): + dis, inspect, opcode, token, tokenize. + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-7) unstable; urgency=medium + + * Add licenses and acknowledgements for incorporated software in the + debian/copyright file (addresses: #293932). + * Replace md5 implementation with one having a DFSG conforming license. + * Add missing norwegian locales (Tollef Fog Heen). + * CVS updates of the release24-maint branch upto 2005-02-08 (date of + the Python 2.3.5 release). + + -- Matthias Klose Tue, 8 Feb 2005 19:13:10 +0100 + +python2.4 (2.4-6) unstable; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Apply the pydebug-path patch. The package was already built in -5. + + -- Matthias Klose Fri, 4 Feb 2005 22:15:13 +0100 + +python2.4 (2.4-5) unstable; urgency=high + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + * CVS updates of the release24-maint branch upto 2005-02-04. + + -- Matthias Klose Fri, 4 Feb 2005 08:12:10 +0100 + +python2.4 (2.4-4) unstable; urgency=medium + + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Remove /usr/bin/smtpd.py (closes: #291049). + + -- Matthias Klose Mon, 17 Jan 2005 23:54:37 +0100 + +python2.4 (2.4-3ubuntu6) hoary; urgency=low + + * Use old-style dpatches instead of dpatch-run. + + -- Tollef Fog Heen Mon, 7 Feb 2005 15:58:05 +0100 + +python2.4 (2.4-3ubuntu5) hoary; urgency=low + + * Actually apply the patch as well (add to list of patches in + debian/rules) + + -- Tollef Fog Heen Sun, 6 Feb 2005 15:12:58 +0100 + +python2.4 (2.4-3ubuntu4) hoary; urgency=low + + * Add nb_NO and nn_NO locales to Lib/locale.py + + -- Tollef Fog Heen Sun, 6 Feb 2005 14:33:05 +0100 + +python2.4 (2.4-3ubuntu3) hoary; urgency=low + + * Fix a flaw in SimpleXMLRPCServerthat can affect any XML-RPC servers. + This affects any programs have been written that allow remote + untrusted users to do unrestricted traversal and can allow them to + access or change function internals using the im_* and func_* attributes. + References: CAN-2005-0089. + + -- Matthias Klose Wed, 2 Feb 2005 09:08:20 +0000 + +python2.4 (2.4-3ubuntu2) hoary; urgency=low + + * Build a python2.4-dbg package using --with-pydebug. Add a debug + directory /lib-dynload/debug to sys.path instead of + /lib-dynload und install the extension modules of the + debug build in this directory. + Change the module load path to load extension modules from other + site-packages/debug directories (for further details see the + README in the python2.4-dbg package). Closes: #5415. + * Update debian/copyright to the 2.4 license text (closes: #290898). + * Add operator and copy to the -minimal package. + + -- Matthias Klose Mon, 17 Jan 2005 23:19:47 +0100 + +python2.4 (2.4-3ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * python2.4: Depend on the very same version of python2.4-minimal. + * Docment, that time.strptime currently cannot be used, if the + python-minimal package is installed without the python package. + + -- Matthias Klose Sun, 9 Jan 2005 19:35:48 +0100 + +python2.4 (2.4-3) unstable; urgency=medium + + * Build the fpectl module. + * Updated to CVS release24-maint 20050107. + + -- Matthias Klose Sat, 8 Jan 2005 19:05:21 +0100 + +python2.4 (2.4-2ubuntu5) hoary; urgency=low + + * Updated to CVS release24-maint 20050102. + * python-minimal: + - os.py: Use dict instead of UserDict, remove UserDict from -minimal. + - add pickle, threading, needed for subprocess module. + - optparse.py: conditionally import gettext, if not available, + define _ as the identity function. Patch taken from the trunk. + Avoids import of _locale, locale, gettext, copy, repr, itertools, + collections, token, tokenize. + - Add a build check to make sure that the minimal module list is + closed under dependency. + * Fix lintian warnings. + + -- Matthias Klose Sun, 2 Jan 2005 22:00:14 +0100 + +python2.4 (2.4-2ubuntu4) hoary; urgency=low + + * Add UserDict.py to the -minimal package, since os.py needs it. + + -- Colin Watson Thu, 30 Dec 2004 20:41:28 +0000 + +python2.4 (2.4-2ubuntu3) hoary; urgency=low + + * Add os.py and traceback.py to the -minimal package, get the list + of modules from the README. + + -- Matthias Klose Mon, 27 Dec 2004 08:20:45 +0100 + +python2.4 (2.4-2ubuntu2) hoary; urgency=low + + * Add compileall.py and py_compile.py to the -minimal package, not + just to the README ... + + -- Matthias Klose Sat, 25 Dec 2004 22:24:56 +0100 + +python2.4 (2.4-2ubuntu1) hoary; urgency=low + + * Separate the interpreter and a minimal subset of modules into + a python2.4-minimal package. See the README.Debian.gz in this + package. + * Move site.py to python2.4-minimal as well. + * Add documentation files for devhelp. + + -- Matthias Klose Sun, 19 Dec 2004 22:47:32 +0100 + +python2.4 (2.4-2) unstable; urgency=medium + + * Updated patch for #283108. Thanks to Jim Meyering. + + -- Matthias Klose Fri, 3 Dec 2004 17:00:16 +0100 + +python2.4 (2.4-1) unstable; urgency=low + + * Final 2.4 release. + * Flush stdout/stderr if closed (SF #1074011). + + -- Matthias Klose Wed, 1 Dec 2004 07:54:34 +0100 + +python2.4 (2.3.97-2) unstable; urgency=low + + * Don't run test_tcl, hanging on the buildds. + + -- Matthias Klose Fri, 19 Nov 2004 23:48:42 +0100 + +python2.4 (2.3.97-1) unstable; urgency=low + + * Python 2.4 Release Candidate 1. + + -- Matthias Klose Fri, 19 Nov 2004 21:27:02 +0100 + +python2.4 (2.3.96-1) experimental; urgency=low + + * Updated to CVS release24-maint 20041113. + * Build the docs in info format again. + + -- Matthias Klose Sat, 13 Nov 2004 21:21:10 +0100 + +python2.4 (2.3.95-2) experimental; urgency=low + + * Move distutils package from the python2.4-dev into the python2.4 + package. + + -- Matthias Klose Thu, 11 Nov 2004 22:56:14 +0100 + +python2.4 (2.3.95-1) experimental; urgency=low + + * Python 2.4 beta2 release. + + -- Matthias Klose Thu, 4 Nov 2004 23:43:47 +0100 + +python2.4 (2.3.94-1) experimental; urgency=low + + * Python 2.4 beta1 release. + + -- Matthias Klose Sat, 16 Oct 2004 08:33:57 +0200 + +python2.4 (2.3.93-1) experimental; urgency=low + + * Python 2.4 alpha3 release. + + -- Matthias Klose Fri, 3 Sep 2004 21:53:47 +0200 + +python2.4 (2.3.92-1) experimental; urgency=low + + * Python 2.4 alpha2 release. + + -- Matthias Klose Thu, 5 Aug 2004 23:53:18 +0200 + +python2.4 (2.3.91-1) experimental; urgency=low + + * Python 2.4 alpha1 release. + Highlights: http://www.python.org/2.4/highlights.html + + -- Matthias Klose Fri, 9 Jul 2004 17:38:54 +0200 + +python2.4 (2.3.90-1) experimental; urgency=low + + * Package HEAD branch (pre alpha ..). + + -- Matthias Klose Mon, 14 Jun 2004 23:19:57 +0200 + +python2.3 (2.3.4-1) unstable; urgency=medium + + * Final Python 2.3.4 Release. + * In the API docs, fix signature of PyModule_AddIntConstant (closes: #250826). + * locale.getdefaultlocale: don't fail with empty environment variables. + Closes: #249816. + * Include distutils/command/wininst.exe in -dev package (closes: #249006). + * Disable cthreads on the Hurd (Michael Banck). Closes: #247211. + * Add a note to pygettext(1), that this program is deprecated in favour + of xgettext, which now includes support for Python as well. + Closes: #246332. + + -- Matthias Klose Fri, 28 May 2004 22:59:42 +0200 + +python2.3 (2.3.3.91-1) unstable; urgency=low + + * Python 2.3.4 Release Candidate 1. + * Do not use the default namespace for attributes. Patch taken from the + 2.3 maintenance branch. + The xmllib module is obsolete. Use xml.sax instead. + * http://python.org/sf/945642 - fix nonblocking i/o with ssl socket. + + -- Matthias Klose Thu, 13 May 2004 21:24:52 +0200 + +python2.3 (2.3.3-7) unstable; urgency=low + + * Add a workaround for GNU libc nl_langinfo()'s returning NULL. + Closes: #239237. + Patch taken from 2.3 maintenance branch. + * threading.py: Remove calls to currentThread() in _Condition methods that + were side-effect. Side-effects were deemed unnecessary and were causing + problems at shutdown time when threads were catching exceptions at start + time and then triggering exceptions trying to call currentThread() after + gc'ed. Masked the initial exception which was deemed bad. + Closes: #195812. + * Properly support normalization of empty unicode strings. Closes: #239986. + Patch taken from 2.3 maintenance branch. + * README.maintainers: Add section where to find the documentation tools. + * Fix crash in pyexpat module (closes: #229281). + * For the Hurd, set the interpreters recursion limit to 930. + * Do not try to byte-compile the test files on installation; this + currently breaks the Hurd install. + + -- Matthias Klose Sat, 1 May 2004 07:50:46 +0200 + +python2.3 (2.3.3-6) unstable; urgency=low + + * Don't build the unversioned python{,-*} packages anymore. Now + built from the python-defaults package. + * Update to the proposed python-policy: byte-compile using -E. + * Remove python-elisp's dependency on emacs20 (closes: #232785). + * Don't build python-elisp from the python2.3 source anymore, + get it from python-mode.sf.net as a separate source package. + * python2.3-dev suggests libc-dev (closes: #231091). + * get LDSHARED and CCSHARED (like, CC, CXX, CPP, CFLAGS) from + the environment + * Set CXX in installed config/Makefile (closes: #230273). + + -- Matthias Klose Tue, 24 Feb 2004 07:07:51 +0100 + +python2.3 (2.3.3-5) unstable; urgency=low + + * Build-depend on libdb4.2-dev, instead of libdb4.1-dev. According + to the docs the file format is compatible. + + -- Matthias Klose Mon, 12 Jan 2004 10:37:45 +0100 + +python2.3 (2.3.3-4) unstable; urgency=low + + * Fix broken _bsddb module. setup.py picked up the wrong library. + + -- Matthias Klose Sun, 4 Jan 2004 11:30:00 +0100 + +python2.3 (2.3.3-3) unstable; urgency=low + + * Fix typo in patch (closes: #224797, #226064). + + -- Matthias Klose Sun, 4 Jan 2004 09:23:21 +0100 + +python2.3 (2.3.3-2) unstable; urgency=medium + + * Lib/email/Charset: use locale unaware function to lower case of locale + name (closes: #224797). + * Update python-mode to version from python-mode.sf.net. Fixes highlighting + problems (closes: #223520). + * Backport from mainline: Add IPV6_ socket options from RFCs 3493 and 3542. + + -- Matthias Klose Fri, 2 Jan 2004 14:03:26 +0100 + +python2.3 (2.3.3-1) unstable; urgency=low + + * New upstream release. + * Copy the templates, tools and scripts from the Doc dir in the source + to /usr/share/lib/python2.3/doc in the python2.3-dev package. Needed + for packages building documentation like python does (closes: #207337). + + -- Matthias Klose Fri, 19 Dec 2003 10:57:39 +0100 + +python2.3 (2.3.2.91-1) unstable; urgency=low + + * New upstream version (2.3.3 release candidate). + * Update python-mode.el (closes: #158811, #159630). + Closing unreproducible report (closes: #159628). + + -- Matthias Klose Sat, 6 Dec 2003 14:41:14 +0100 + +python2.3 (2.3.2-7) unstable; urgency=low + + * Put the conflict in the correct direction. python2.3 (2.3.2-6) doesn't + conflict with python (<= 2.3.2-5) but python (2.3.2-6) conflicts with + python2.3 (<= 2.3.2-5) (thanks to Brian May). Really closes #221791. + + -- Matthias Klose Fri, 21 Nov 2003 00:20:02 +0100 + +python2.3 (2.3.2-6) unstable; urgency=low + + * Add conflicts with older python{,2.3} packages to fix overwrite + errors (closes: #221791). + + -- Matthias Klose Thu, 20 Nov 2003 07:24:36 +0100 + +python2.3 (2.3.2-5) unstable; urgency=low + + * Updated to CVS release23-maint 20031119. + * Re-upgrade the dependency of python2.3 on python (>= 2.3) to + a dependency (closes: #221523). + + -- Matthias Klose Wed, 19 Nov 2003 00:30:27 +0100 + +python2.3 (2.3.2-4) unstable; urgency=low + + * Don't build-depend on latex2html (moved to non-free), but keep + the prebuilt docs in debian/patches (closes: #221347). + * Fix typos in the library reference (closes: #220510, #220954). + * Fix typo in python-elisp's autoloading code (closes: #220308). + * Update proposed python policy: private modules can be installed + into /usr/lib/ (arch dependent) and into /usr/share/ + (arch independent). + + -- Matthias Klose Tue, 18 Nov 2003 00:41:39 +0100 + +python2.3 (2.3.2-3) unstable; urgency=low + + * Downgrade the dependency of python2.3 on python (>= 2.3) to + a recommendation. + * Fix path to interpreter in binfmt file. + * Fix segfault in unicodedata module (closes: #218697). + * Adjust python-elisp autoload code (closes: #219821). + + -- Matthias Klose Sun, 9 Nov 2003 19:43:37 +0100 + +python2.3 (2.3.2-2) unstable; urgency=medium + + * Fix broken doc link (closes: #214217). + * Disable wrongly detected large file support for GNU/Hurd. + * Really fix the FTBFS for the binary-indep target (closes: #214303). + + -- Matthias Klose Mon, 6 Oct 2003 07:54:58 +0200 + +python2.3 (2.3.2-1) unstable; urgency=low + + * New upstream version. + * Fix a FTBFS for the binary-indep target. + + -- Matthias Klose Sat, 4 Oct 2003 10:20:15 +0200 + +python2.3 (2.3.1-3) unstable; urgency=low + + * Fix names of codec packages in recommends. + * On alpha compile using -mieee (see #212912). + + -- Matthias Klose Sun, 28 Sep 2003 10:48:12 +0200 + +python2.3 (2.3.1-2) unstable; urgency=low + + * Update python policy draft (closes: #128911, #163785). + * Re-add os.fsync function (closes: #212672). + * Let python2.3-doc conflict with older python2.3 versions (closes: #211882). + * Add recommends for pythonX.Y-japanese-codecs, pythonX.Y-iconvcodec, + pythonX.Y-cjkcodecs, pythonX.Y-korean-codecs (closes: #207161). + * Generate binfmt file (closes: #208005). + * Add IPPROTO_IPV6 option to the socketmodule (closes: #206569). + * Bugs reported against python2.2 and fixed in python2.3: + - Crashes in idle (closes: #186887, #200084). + + -- Matthias Klose Sat, 27 Sep 2003 11:21:47 +0200 + +python2.3 (2.3.1-1) unstable; urgency=low + + * New upstream version (bug fix release). + + -- Matthias Klose Wed, 24 Sep 2003 11:27:43 +0200 + +python2.3 (2.3-4) unstable; urgency=high + + * Disable check for utimes function, which is broken in glibc-2.3.2. + Packages using distutils had '1970/01/01-01:00:01' timestamps in files. + * Bugs fixed by making python2.3 the default python version: + - Canvas.scan_dragto() takes a 3rd optional parmeter "gain". + Closes: #158168. + - New command line parsing module (closes: #38628). + - compileall.py allows compiling single files (closes: #139971). + * Bugs reported for 2.2 and fixed in 2.3: + - Idle does save files with ASCII characters (closes: #179313). + - imaplib support for prefix-quoted strings (closes: #150485). + - posixpath includes getctime (closes: #173827). + - pydoc has support for keywords (closes: #186775). + * Bugs reported for 2.1 and fixed in 2.3: + - Fix handling of "#anchor" URLs in urlparse (closes: #147844). + - Fix readline if C stdin is not a tty, even if sys.stdin is. + Closes: #131810. + * Updated to CVS release23-maint 20030810 (fixing memory leaks in + array and socket modules). + * pydoc's usage output uses the basename of the script. + * Don't explicitely remove /etc/python2.3 on purge (closes: #202864). + * python conflicts with python-xmlbase (closes: #204773). + * Add dependency python (>= 2.3) to python2.3, so make sure the + unversioned names can be used. + + -- Matthias Klose Sun, 10 Aug 2003 09:27:52 +0200 + +python2.3 (2.3-3) unstable; urgency=medium + + * Fix shlibs file. + + -- Matthias Klose Fri, 8 Aug 2003 08:45:12 +0200 + +python2.3 (2.3-2) unstable; urgency=medium + + * Make python2.3 the default python version. + + -- Matthias Klose Tue, 5 Aug 2003 22:13:22 +0200 + +python2.3 (2.3-1) unstable; urgency=low + + * Python 2.3 final release. + + -- Matthias Klose Wed, 30 Jul 2003 08:12:28 +0200 + +python2.3 (2.2.107-1rc2) unstable; urgency=medium + + * Python 2.3 release candidate 2. + * Don't compress .txt files referenced by the html docs (closes: #200298). + * Include the email/_compat* files (closes: #200349). + + -- Matthias Klose Fri, 25 Jul 2003 07:08:09 +0200 + +python2.3 (2.2.106-2beta2) unstable; urgency=medium + + * Python 2.3 beta2 release, updated to CVS 20030704. + - Fixes AssertionError in httplib (closed: #192452). + - Fixes uncaught division by zero in difflib.py (closed: #199287). + * Detect presence of setgroups(2) at configure time (closes: #199839). + * Use default gcc on arm as well. + + -- Matthias Klose Sat, 5 Jul 2003 10:21:33 +0200 + +python2.3 (2.2.105-1beta2) unstable; urgency=low + + * Python 2.3 beta2 release. + - Includes merged idle fork. + - Fixed socket.setdefaulttimeout(). Closes: #189380. + - socket.ssl works with _socketobj. Closes: #196082. + * Do not link libtix to the _tkinter module. It's loaded via + 'package require tix' at runtime. python2.3-tkinter now + suggests tix8.1 instead. + * On arm, use gcc-3.2 to build. + * Add -fno-strict-aliasing rules to OPT to avoid warnings + "dereferencing type-punned pointer will break strict-aliasing rules", + when building with gcc-3.3. + + -- Matthias Klose Mon, 30 Jun 2003 00:19:32 +0200 + +python2.3 (2.2.104-1beta1.1) unstable; urgency=low + + * Non-maintainer upload with maintainer consent. + * debian/control (Build-Depends): s/libgdbmg1-dev/libgdbm-dev/. + + -- James Troup Wed, 4 Jun 2003 02:24:27 +0100 + +python2.3 (2.2.104-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030514. + - build the current documentation. + * Reenable Tix support. + + -- Matthias Klose Wed, 14 May 2003 07:38:57 +0200 + +python2.3 (2.2.103-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release, updated to CVS 20030506. + - updated due to build problems on mips/mipsel. + - keep the 2.3b1 documentation (doc build problems with cvs). + + -- Matthias Klose Wed, 7 May 2003 06:26:39 +0200 + +python2.3 (2.2.102-1beta1) unstable; urgency=low + + * Python 2.3 beta1 release. + + -- Matthias Klose Sat, 3 May 2003 22:45:16 +0200 + +python2.3 (2.2.101-1exp1) unstable; urgency=medium + + * Python 2.3 alpha2 release, updated to CVS 20030321. + * Tkinter: Catch exceptions thrown for undefined substitutions in + events (needed for tk 8.4.2). + + -- Matthias Klose Fri, 21 Mar 2003 21:32:14 +0100 + +python2.3 (2.2.100-1exp1) unstable; urgency=low + + * Python 2.3 alpha2 release, updated to CVS 20030221. + + -- Matthias Klose Fri, 21 Feb 2003 19:37:17 +0100 + +python2.3 (2.2.99-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030123. + - should fix the testsuite (and package build) failure on alpha. + * Remove build dependency on libexpat1-dev. Merge the python2.3-xmlbase + package into python2.3 (closes: #177739). + + -- Matthias Klose Thu, 23 Jan 2003 22:48:12 +0100 + +python2.3 (2.2.98-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030117. + * Build using libdb4.1. + + -- Matthias Klose Sat, 18 Jan 2003 00:14:01 +0100 + +python2.3 (2.2.97-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release updated to CVS 20030109. + * Build-Depend on g++ (>= 3:3.2). + * Python package maintainers: please wait uploading python dependent + packages until python2.2 and python2.1 are compiled using gcc-3.2. + + -- Matthias Klose Thu, 9 Jan 2003 23:56:42 +0100 + +python2.3 (2.2.96-1exp1) unstable; urgency=low + + * Python 2.3 alpha1 release (not exactly the tarball, but taken from + CVS 20030101). + - Includes support for linking with threaded tk8.4 (closes: #172714). + * Install and register whatsnew document (closes: #173859). + * Properly unregister info documentation. + + -- Matthias Klose Wed, 1 Jan 2003 17:38:54 +0100 + +python2.3 (2.2.95-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021212. + - data in unicodedate module is up to date (closes: #171061). + * Fix idle packaging (closes: #170394). + * Configure using unicode UCS-4 (closes: #171062). + This change breaks compatibility with binary modules, but what do you + expect from experimental packages ... Please recompile dependent packages. + * Don't strip binaries for now. + + -- Matthias Klose Thu, 12 Dec 2002 21:42:27 +0100 + +python2.3 (2.2.94-1exp1) unstable; urgency=low + + * Experimental packages from CVS 021120. + * Remove outdated README.dbm. + * Depend on tk8.4. + * python-elisp: Install emacsen install file with mode 644 (closes: #167718). + + -- Matthias Klose Thu, 21 Nov 2002 01:04:51 +0100 + +python2.3 (2.2.93-1exp1) unstable; urgency=medium + + * Experimental packages from CVS 021015. + * Build a static library libpython2.3-pic.a. + * Enable large file support for the Hurd (closes: #164602). + + -- Matthias Klose Tue, 15 Oct 2002 21:06:27 +0200 + +python2.3 (2.2.92-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020922. + * Fix build error on ia64 (closes: #161234). + * Build depend on gcc-3.2-3.2.1-0pre2 to fix build error on arm. + + -- Matthias Klose Sun, 22 Sep 2002 18:30:28 +0200 + +python2.3 (2.2.91-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020906. + * idle-python2.3: Fix conflict (closes: #159267). + * Fix location of python-mode.el (closes: #159564, #159619). + * Use tix8.1. + * Apply fix for distutils/ccompiler problem (closes: #159288). + + -- Matthias Klose Sat, 7 Sep 2002 09:55:07 +0200 + +python2.3 (2.2.90-1exp1) unstable; urgency=low + + * Experimental packages from CVS 020820. + * Don't build python2.3-elisp, but put the latest version into + python-elisp. + + -- Matthias Klose Thu, 22 Aug 2002 21:52:04 +0200 + +python2.2 (2.2.1-6) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-07-23. + * Enable IPv6 support (closes: #152543). + * Add python2.2-tk suggestion for python2.2 (pydoc -g). + * Fix from SF patch #527518: proxy config with user+pass authentication. + * Point pydoc to the correct location of the docs (closes: #147579). + * Remove '*.py[co]' files, when removing the python package, + not when purging (closes: #147130). + * Update to new py2texi.el version (Milan Zamazal). + + -- Matthias Klose Mon, 29 Jul 2002 23:11:32 +0200 + +python2.2 (2.2.1-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 2002-05-03. + * Build the info docs (closes: #145653). + + -- Matthias Klose Fri, 3 May 2002 22:35:46 +0200 + +python2.2 (2.2.1-4) unstable; urgency=high + + * Fix indentation errors introduced in last upload (closes: #143809). + + -- Matthias Klose Sun, 21 Apr 2002 01:00:14 +0200 + +python2.2 (2.2.1-3) unstable; urgency=high + + * Add Build-Conflicts: tcl8.0-dev, tk8.0-dev, tcl8.2-dev, tk8.2-dev. + Closes: #143534 (build a working _tkinter module, on machines, where + 8.0's tk.h gets included). + * CVS updates of the release22-maint branch upto 2002-04-20. + + -- Matthias Klose Sat, 20 Apr 2002 09:22:37 +0200 + +python2.2 (2.2.1-2) unstable; urgency=low + + * Forgot to copy the dlmodule patch from the 2.1.3 package. Really + closes: #141681. + + -- Matthias Klose Sat, 13 Apr 2002 01:28:05 +0200 + +python2.2 (2.2.1-1) unstable; urgency=high + + * Final 2.2.1 release. + * According to report #131813, the python interpreter is much faster on some + architectures, when beeing linked statically with the python library (25%). + Gregor and me tested on i386, m68k and alpha, but we could not reproduce + such a speedup (generally between 5% and 10%). But we are linking the + python executable now statically ... + * Build info docs from the tex source, merge the python-doc-info + package into the python-doc package. + * Always build the dl module. Failure in case of + sizeof(int)!=sizeof(long)!=sizeof(void*) + is delayed until dl.open is called. Closes: #141681. + + -- Matthias Klose Thu, 11 Apr 2002 00:19:19 +0200 + +python2.2 (2.2.0.92-0) unstable; urgency=low + + * Package CVS sources, omit cvs-updates.dpatch (closes: #140977). + + -- Matthias Klose Wed, 3 Apr 2002 08:20:52 +0200 + +python2.2 (2.2-6) unstable; urgency=medium + + * Update to python-2.2.1 release candidate 2 (final release scheduled + for April 10). + * Enable dl module (closes: #138992). + * Build doc files with python binary from package (closes: #139657). + * Build _tkinter module with BLT and Tix support. + * python2.2-elisp: Conflict with python2-elisp (closes: #138970). + * string.split docs updated in python-2.2.1 (closes: #129272). + + -- Matthias Klose Mon, 1 Apr 2002 13:52:36 +0200 + +python2.2 (2.2-5) unstable; urgency=low + + * CVS updates of the release22-maint branch upto 20020310 (aproaching + the first 2.2.1 release candidate). + * Stolen from HEAD: check argument of locale.nl_langinfo (closes: #137371). + + -- Matthias Klose Fri, 15 Mar 2002 01:05:59 +0100 + +python2.2 (2.2-4) unstable; urgency=medium + + * Include test/{__init__.py,README,pystone.py} in package (closes: #129013). + * Fix python-elisp conflict (closes: #129046). + * Don't compress stylesheets (closes: #133179). + * CVS updates of the release22-maint branch upto 20020310. + + -- Matthias Klose Sun, 10 Mar 2002 23:32:28 +0100 + +python2.2 (2.2-3) unstable; urgency=medium + + * Updates from the CVS python22-maint branch up to 20020107. + webbrowser.py: properly escape url's. + * The Hurd does not have large file support: disabled. + + -- Matthias Klose Mon, 7 Jan 2002 21:55:57 +0100 + +python2.2 (2.2-2) unstable; urgency=medium + + * CVS updates of the release22-maint branch upto 20011229. Fixes: + - Include TCP_CORK flag in plat-linux2 headers (fixes: #84340). + - Update CDROM.py module (fixes: #125785). + * Add missing chunk of the GNU/Hurd patch (therefore urgency medium). + * Send anonymous password when using anonftp (closes: #126814). + + -- Matthias Klose Sat, 29 Dec 2001 20:18:26 +0100 + +python2.2 (2.2-1) unstable; urgency=low + + * New upstream version: 2.2. + * Bugs fixed upstream: + - Docs for os.kill reference the signal module for constants. + - Documentation strings in the tutorial end with a period (closes: #94770). + - Tk: grid_location method moved from Grid to Misc (closes: #98338). + - mhlib.SubMessage.getbodytext takes decode parameter (closes: #31876). + - Strings in modules are locale aware (closes: #51444). + - Printable 8-bit characters in strings are correctly printed + (closes: #64354). + - Dictionary can be updated with abstract mapping object (closes: #46566). + * Make site.py a config files. + + -- Matthias Klose Sat, 22 Dec 2001 00:51:46 +0100 + +python2.2 (2.1.99c1-1) unstable; urgency=low + + * New upstream version: 2.2c1 (release candidate). + * Do not provide python2.2-base anymore. + * Install correct README.Debian for python2.2 package. Include hint + where to find Makefile.pre.in. + * Suggest installation of python-ssl. + * Remove idle config files on purge. + * Remove empty /usr/lib/python2.2 directory on purge. + + -- Matthias Klose Sat, 15 Dec 2001 17:56:27 +0100 + +python2.2 (2.1.99beta2-1) unstable; urgency=high + + * debian/rules: Reflect removal of regrtest package (closes: #122278). + Resulted in build failures on all architectures. + * Build -doc package from source. + + -- Matthias Klose Sat, 8 Dec 2001 00:38:41 +0100 + +python2.2 (2.1.99beta2-0.1) unstable; urgency=low + + * Non maintainer upload. + * New upstream version (this is 2.2beta2). + * Do not build the python-regrtest package anymore; keep the test framework + components test/regrtest.py and test/test_support.py in the python + package (closes: #119408). + + -- Gregor Hoffleit Tue, 27 Nov 2001 09:53:26 +0100 + +python2.2 (2.1.99beta1-4) unstable; urgency=low + + * Configure with --with-fpectl (closes: #118125). + * setup.py: Remove broken check for _curses_panel module (#116081). + * idle: Move config-* files to /etc and mark as conffiles (#106390). + * Move idle packages to section `devel'. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-3) unstable; urgency=low + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * README.Debian: point to draft of python-policy in the python package. + + -- Matthias Klose Wed, 31 Oct 2001 10:56:45 +0100 + +python2.2 (2.1.99beta1-2) unstable; urgency=medium + + * Fix shlibs file (was still referring to 2.1). Closes: #116810. + * Rename package python2.2-base to python2.2. + + -- Matthias Klose Wed, 24 Oct 2001 23:00:50 +0200 + +python2.2 (2.1.99beta1-1) unstable; urgency=low + + * New upstream version (beta). Call the package version 2.1.99beta1-1. + * New maintainer until the final 2.2 release. + * Updated the debian patches. + + -- Matthias Klose Sat, 20 Oct 2001 18:56:26 +0200 + +python2.1 (2.1.1-1.2) unstable; urgency=low + + * Really remove the python alternative. + + -- Matthias Klose Sat, 20 Oct 2001 15:16:56 +0200 + +python2.1 (2.1.1-1.1) unstable; urgency=low + + * README FOR PACKAGE MAINTAINERS: It is planned to remove the python2-XXX + packages from unstable and move on to python2.1. + If you repackage/adapt your modules for python2.1, don't build + python2-XXX and python2.1-XXX packages from the same source package, + so that the python2-XXX package can be removed without influencing the + python2.1-XXX package. + + See the debian-python mailing list at http://lists.debian.org/devel.html + for details and the current discussion and a draft for a debian-python + policy (August to October 2001). + + * Remove alternative for /usr/bin/python. The python-base package now + provides the default python version. + + * Regenerate control file to fix build dependencies (closes: #116190). + * Remove alternative for /usr/bin/{python,pydoc}. + * Provide a libpython2.1.so symlink in /usr/lib/python2.1/config, + so that the shared library is found when -L/usr/lib/python2.1/config + is specified. + * Conflict with old package versions, where /usr/bin/python is a real + program (closes: #115943). + * python2.1-elisp conflicts with python-elisp (closes: #115895). + * We now have 2.1 (closes: #96851, #107849, #110243). + + -- Matthias Klose Fri, 19 Oct 2001 17:34:41 +0200 + +python2.1 (2.1.1-1) unstable; urgency=low + + * Incorporated Matthias' modifications. + + -- Gregor Hoffleit Thu, 11 Oct 2001 00:16:42 +0200 + +python2.1 (2.1.1-0.2) unstable; urgency=low + + * New upstream 2.1.1. + * GPL compatible licence (fixes #84080, #102949, #110643). + * Fixed upstream (closes: #99692, #111340). + * Build in separate build directory. + * Split Debian patches into debian/patches directory. + * Build dependencies: Add libgmp3-dev, libexpat1-dev, tighten + debhelper dependency. + * debian/rules: Updated a "bit". + * python-elisp: Remove custom dependency (closes: #87783), + fix emacs path (closes: #89712), remove emacs19 dependency (#82694). + * Mention distutils in python-dev package description (closes: #108170). + * Update README.Debian (closes: #85430). + * Run versioned python in postinsts (closes: #113349). + * debian/sample.{postinst,prerm}: Change to version independent scripts. + * Use '/usr/bin/env python2.1' as interpreter for all python scripts. + * Add libssl-dev to Build-Conflicts. + * python-elisp: Add support for emacs21 (closes: #98635). + * Do not compress .py files in doc directories. + * Don't link explicitely with libc. + + -- Matthias Klose Wed, 3 Oct 2001 09:53:08 +0200 + +python2.1 (2.1.1-0.1) unstable; urgency=low + + * New upstream version (CVS branch release21-maint, will become 2.1.1): + This CVS branch will be released as 2.1.1 under a GPL compatible + license. + + -- Gregor Hoffleit Wed, 27 Jun 2001 22:47:58 +0200 + +python2 (2.1-0.1) unstable; urgency=low + + * Fixed Makefile.pre.in. + * Fixed the postinst files in order to use 2.1 (instead of 2.0). + * Mention the immanent release of 2.0.1 and 2.1.1, with a GPL + compatible license. + + -- Gregor Hoffleit Sun, 17 Jun 2001 21:05:25 +0200 + +python2 (2.1-0) unstable; urgency=low + + * New upstream version. + * Experimental packages. + + -- Gregor Hoffleit Thu, 10 May 2001 00:20:04 +0200 + +python2 (2.0-7) unstable; urgency=low + + * Rebuilt with recent tcl8.3-dev/tk8.3-dev in order to fix a + dependency problem with python2-tk (closes: #87793, #92962). + * Change postinst to create and update /usr/local/lib/python2.0 and + site-python with permissions and owner as mandated by policy: + 2775 and root:staff (closes: #89047). + * Fix to compileall.py: A superfluous argument made compileall without + options fail (cf. #92990 for python). + * Move the distutils module into python2-dev. It needs Makefile.pre.in + in order to work (closes: #89900). + * Remove build-dependency on libgdbm2-dev (which isn't built anyway). + * Add a build-dependency on libdb2-dev (cf. #90220 for python). + + -- Gregor Hoffleit Sat, 14 Apr 2001 21:07:51 +0200 + +python2 (2.0-6) unstable; urgency=low + + * Remove python-zlib package; merge it into python-base. + * Mark that README.python2 is not yet updated. + + -- Gregor Hoffleit Wed, 21 Feb 2001 12:34:18 +0100 + +python2 (2.0-5) unstable; urgency=low + + * Recompile with tcl/tk8.3 (closes: #82088). + * Modifications to README.why-python2 (closes: #82116). + * Add menu hint to idle2 menu entry. + * idle2 is renamed idle-python2 and now build correctly (closes: #82218). + * Add build-dependency on autoconf (closes: #85339). + * Build bsddbmodule as shared module (Modules/Setup.config.in), + and link libpython2.so with -lm in Makefile (closes: #86027). + * various cleanups in debian/rules, e.g. removing dh_suidregister. + * Make pdb available as /usr/bin/pdb-python2 in python2-dev + (cf. #79870 in python-base). + * Remove libgmp3 from build-dependencies, since we currently can't + build the mpzmodule for Python2 due to license problems. + + -- Gregor Hoffleit Sun, 18 Feb 2001 00:12:17 +0100 + +python2 (2.0-4) unstable; urgency=low + + * control: make python2-elisp conflict with python-elisp (it doesn't + make sense to have both of them installed, does it ?) + * include build-depend on libxmltok1-dev. + * again, build with tcl/tk8.0. + + -- Gregor Hoffleit Wed, 10 Jan 2001 23:37:01 +0100 + +python2 (2.0-3) unstable; urgency=low + + * Modules/Setup.in: Added a missing \ that made _tkinter be built + incorrectly. + * rules: on the fly, change all '#!' python scripts to use python2. + + -- Gregor Hoffleit Wed, 13 Dec 2000 20:07:24 +0100 + +python2 (2.0-2) unstable; urgency=low + + * Aaargh. Remove conflicts/provides/replaces on python-base to make + parallel installation of python-base and python2-base possible. + * Install examples into /usr/share/doc/python2 (not python) and fix + symlink to python2.0 (thanks to Rick Younie for + pointing out this). + * Rename man page to python2.1. + + -- Gregor Hoffleit Wed, 13 Dec 2000 09:31:05 +0100 + +python2 (2.0-1) unstable; urgency=low + + * New upstream version. Initial release for python2. + + -- Gregor Hoffleit Mon, 11 Dec 2000 22:39:46 +0100 --- python2.7-2.7.12.orig/debian/changelog.shared +++ python2.7-2.7.12/debian/changelog.shared @@ -0,0 +1,3 @@ + * Link the interpreter against the shared runtime library. With + gcc-4.1 the difference in the pystones benchmark dropped from about + 12% to about 5%. --- python2.7-2.7.12.orig/debian/compat +++ python2.7-2.7.12/debian/compat @@ -0,0 +1 @@ +9 --- python2.7-2.7.12.orig/debian/control +++ python2.7-2.7.12/debian/control @@ -0,0 +1,217 @@ +Source: python2.7 +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.11), gcc (>= 4:6.1), + quilt, autoconf, autotools-dev, + lsb-release, sharutils, + libreadline-dev, libtinfo-dev, libncursesw5-dev (>= 5.3), + tk-dev, blt-dev (>= 2.4z), libssl-dev, + zlib1g-dev, libbz2-dev, + libexpat1-dev, + libbluetooth-dev [linux-any], + locales [!armel !avr32 !hppa !ia64 !mipsel], + libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32], + libgpm2 [linux-any], + mime-support, netbase, net-tools, bzip2, time, + libdb-dev (<< 1:6.0), libgdbm-dev, python:any, help2man, + xvfb, xauth +Build-Depends-Indep: python-sphinx +Build-Conflicts: tcl8.4-dev, tk8.4-dev, + python2.7-xml, python-xml, + autoconf2.13, python-cxx-dev, + hardening-wrapper +Standards-Version: 3.9.8 +Vcs-Browser: https://code.launchpad.net/~doko/python/pkg2.7-debian +Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg2.7-debian +XS-Testsuite: autopkgtest + +Package: python2.7 +Architecture: any +Multi-Arch: allowed +Priority: standard +Depends: python2.7-minimal (= ${binary:Version}), libpython2.7-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Suggests: python2.7-doc, binutils +Conflicts: python-profiler (<= 2.7.1-2) +Breaks: python-virtualenv (<< 1.7.1.2-2~), vim-nox (<< 2:7.3.547-4), vim-gtk (<< 2:7.3.547-4), vim-gnome (<< 2:7.3.547-4), vim-athena (<< 2:7.3.547-4) +Replaces: python-profiler (<= 2.7.1-2), python2.7-minimal (<< 2.7.3-7~) +Description: Interactive high-level object-oriented language (version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + +Package: libpython2.7-stdlib +Architecture: any +Multi-Arch: same +Priority: standard +Depends: libpython2.7-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Provides: python2.7-cjkcodecs, python2.7-ctypes, python2.7-elementtree, python2.7-celementtree, python2.7-wsgiref, python2.7-profiler, python2.7-argparse, python-argparse +Replaces: python2.7 (<< 2.7.5-0~) +Breaks: python-urllib3 (<< 1.9.1-3) +Description: Interactive high-level object-oriented language (standard library, version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains Python 2.7's standard library. It is normally not + used on its own, but as a dependency of python2.7. + +Package: python2.7-minimal +Architecture: any +Multi-Arch: allowed +Priority: standard +Pre-Depends: ${shlibs:Pre-Depends} +Depends: libpython2.7-minimal (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: python2.7 +Suggests: binfmt-support +Replaces: python2.7 (<< 2.7.8-7~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version 2.7) + This package contains the interpreter and some essential modules. It can + be used in the boot process for some basic tasks. + See /usr/share/doc/python2.7-minimal/README.Debian for a list of the modules + contained in this package. + +Package: libpython2.7-minimal +Architecture: any +Multi-Arch: same +Priority: standard +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libpython2.7-stdlib +Replaces: python2.7 (<< 2.7.4-2), python2.7-minimal (<< 2.7.3-10), libpython2.7-stdlib (<< 2.7.8-7) +Breaks: python2.7-minimal (<< 2.7.4~rc1-1~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version 2.7) + This package contains some essential modules. It is normally not + used on it's own, but as a dependency of python2.7-minimal. + +Package: libpython2.7 +Architecture: any +Multi-Arch: same +Section: libs +Priority: standard +Pre-Depends: ${misc:Pre-Depends} +Depends: libpython2.7-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: python2.7 (<< 2.6) +Description: Shared Python runtime library (version 2.7) + Python is a high-level, interactive, object-oriented language. Its 2.7 version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains the shared runtime library, normally not needed + for programs using the statically linked interpreter. + +Package: python2.7-examples +Architecture: all +Depends: python2.7 (>= ${source:Version}), ${misc:Depends} +Description: Examples for the Python language (v2.7) + Examples, Demos and Tools for Python (v2.7). These are files included in + the upstream Python distribution (v2.7). + +Package: python2.7-dev +Architecture: any +Multi-Arch: allowed +Depends: python2.7 (= ${binary:Version}), libpython2.7-dev (= ${binary:Version}), libpython2.7 (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Recommends: libc6-dev | libc-dev +Replaces: python2.7 (<< 2.7-3) +Description: Header files and a static library for Python (v2.7) + Header files, a static library and development tools for building + Python (v2.7) modules, extending the Python interpreter or embedding + Python (v2.7) in applications. + . + Maintainers of Python packages should read README.maintainers. + +Package: libpython2.7-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: libpython2.7-stdlib (= ${binary:Version}), libpython2.7 (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Replaces: python2.7 (<< 2.7-3), python2.7-dev (<< 2.7.3-10), python2.7-minimal (<< 2.7.3-10) +Recommends: libc6-dev | libc-dev +Description: Header files and a static library for Python (v2.7) + Header files, a static library and development tools for building + Python (v2.7) modules, extending the Python interpreter or embedding + Python (v2.7) in applications. + . + Maintainers of Python packages should read README.maintainers. + . + This package contains development files. It is normally not + used on it's own, but as a dependency of python2.7-dev. + +Package: libpython2.7-testsuite +Section: libdevel +Architecture: all +Depends: libpython2.7-stdlib (>= ${binary:Version}), ${misc:Depends} +Suggests: python-gdbm, python-tk +Description: Testsuite for the Python standard library (v2.7) + The complete testsuite for the Python standard library. Note that + a subset is found in the libpython2.7-stdlib package, which should + be enough for other packages to use (please do not build-depend + on this package, but file a bug report to include additional + testsuite files in the libpython2.7-stdlib package). + +Package: idle-python2.7 +Architecture: all +Depends: python2.7, python-tk (>= 2.6~a3), python2.7-tk, ${misc:Depends} +Enhances: python2.7 +Replaces: python2.7 (<< 2.6.1-2) +Description: IDE for Python (v2.7) using Tkinter + IDLE is an Integrated Development Environment for Python (v2.7). + IDLE is written using Tkinter and therefore quite platform-independent. + +Package: python2.7-doc +Section: doc +Architecture: all +Depends: libjs-jquery, libjs-underscore, ${misc:Depends} +Suggests: python2.7 +Description: Documentation for the high-level object-oriented language Python (v2.7) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v2.7). All documents are provided + in HTML format. The package consists of ten documents: + . + * What's New in Python2.7 + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules + +Package: python2.7-dbg +Section: debug +Architecture: any +Multi-Arch: allowed +Priority: extra +Depends: python2.7 (= ${binary:Version}), libpython2.7-dbg (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python-gdbm-dbg, python-tk-dbg +Description: Debug Build of the Python Interpreter (version 2.7) + The package holds two things: + . + - A Python interpreter configured with --pydebug. Dynamically loaded modules + are searched as _d.so first. Third party extensions need a separate + build to be used by this interpreter. + - Debug information for standard python interpreter and extensions. + . + See the README.debug for more information. + +Package: libpython2.7-dbg +Section: debug +Architecture: any +Multi-Arch: same +Priority: extra +Pre-Depends: ${misc:Pre-Depends} +Depends: libpython2.7-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python2.7-gdbm-dbg, python2.7-tk-dbg +Replaces: python2.7-dbg (<< 2.7.3-10) +Description: Debug Build of the Python Interpreter (version 2.7) + The package holds two things: + . + - Extensions for a Python interpreter configured with --pydebug. + - Debug information for standard python extensions. + . + See the README.debug for more information. + --- python2.7-2.7.12.orig/debian/control.in +++ python2.7-2.7.12/debian/control.in @@ -0,0 +1,217 @@ +Source: @PVER@ +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 9), @bd_dpkgdev@ @bd_gcc@ + quilt, autoconf, autotools-dev, + lsb-release, sharutils, + libreadline-dev, libtinfo-dev, libncursesw5-dev (>= 5.3), + tk-dev, blt-dev (>= 2.4z), libssl-dev, + zlib1g-dev, libbz2-dev, + libexpat1-dev, + libbluetooth-dev [linux-any], + locales [!armel !avr32 !hppa !ia64 !mipsel], + libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32], + libgpm2 [linux-any], + mime-support, netbase, net-tools, bzip2, time, + libdb-dev (<< 1:6.0), libgdbm-dev, python@bd_qual@, help2man, + xvfb, xauth +Build-Depends-Indep: python-sphinx +Build-Conflicts: tcl8.4-dev, tk8.4-dev, + @PVER@-xml, python-xml, + autoconf2.13, python-cxx-dev, + hardening-wrapper +Standards-Version: 3.9.8 +Vcs-Browser: https://code.launchpad.net/~doko/python/pkg@VER@-debian +Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg@VER@-debian +XS-Testsuite: autopkgtest + +Package: @PVER@ +Architecture: any +Multi-Arch: allowed +Priority: @PRIO@ +Depends: @PVER@-minimal (= ${binary:Version}), lib@PVER@-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Suggests: @PVER@-doc, binutils +Conflicts: python-profiler (<= 2.7.1-2) +Breaks: python-virtualenv (<< 1.7.1.2-2~), vim-nox (<< 2:7.3.547-4), vim-gtk (<< 2:7.3.547-4), vim-gnome (<< 2:7.3.547-4), vim-athena (<< 2:7.3.547-4) +Replaces: python-profiler (<= 2.7.1-2), @PVER@-minimal (<< 2.7.3-7~) +Description: Interactive high-level object-oriented language (version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + +Package: lib@PVER@-stdlib +Architecture: any +Multi-Arch: same +Priority: @PRIO@ +Depends: lib@PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends} +Provides: @PVER@-cjkcodecs, @PVER@-ctypes, @PVER@-elementtree, @PVER@-celementtree, @PVER@-wsgiref, @PVER@-profiler, @PVER@-argparse, python-argparse +Replaces: @PVER@ (<< 2.7.5-0~) +Breaks: python-urllib3 (<< 1.9.1-3) +Description: Interactive high-level object-oriented language (standard library, version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains Python @VER@'s standard library. It is normally not + used on its own, but as a dependency of python@VER@. + +Package: @PVER@-minimal +Architecture: any +Multi-Arch: allowed +Priority: @MINPRIO@ +Pre-Depends: ${shlibs:Pre-Depends} +Depends: lib@PVER@-minimal (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: @PVER@ +Suggests: binfmt-support +Replaces: @PVER@ (<< 2.7.8-7~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version @VER@) + This package contains the interpreter and some essential modules. It can + be used in the boot process for some basic tasks. + See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules + contained in this package. + +Package: lib@PVER@-minimal +Architecture: any +Multi-Arch: same +Priority: @MINPRIO@ +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: lib@PVER@-stdlib +Replaces: @PVER@ (<< 2.7.4-2), @PVER@-minimal (<< 2.7.3-10), lib@PVER@-stdlib (<< 2.7.8-7) +Breaks: @PVER@-minimal (<< 2.7.4~rc1-1~) +Conflicts: binfmt-support (<< 1.1.2) +Description: Minimal subset of the Python language (version @VER@) + This package contains some essential modules. It is normally not + used on it's own, but as a dependency of @PVER@-minimal. + +Package: lib@PVER@ +Architecture: any +Multi-Arch: same +Section: libs +Priority: @PRIO@ +Pre-Depends: ${misc:Pre-Depends} +Depends: lib@PVER@-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: @PVER@ (<< 2.6) +Description: Shared Python runtime library (version @VER@) + Python is a high-level, interactive, object-oriented language. Its @VER@ version + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package contains the shared runtime library, normally not needed + for programs using the statically linked interpreter. + +Package: @PVER@-examples +Architecture: all +Depends: @PVER@ (>= ${source:Version}), ${misc:Depends} +Description: Examples for the Python language (v@VER@) + Examples, Demos and Tools for Python (v@VER@). These are files included in + the upstream Python distribution (v@VER@). + +Package: @PVER@-dev +Architecture: any +Multi-Arch: allowed +Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dev (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Recommends: libc6-dev | libc-dev +Replaces: @PVER@ (<< 2.7-3) +Description: Header files and a static library for Python (v@VER@) + Header files, a static library and development tools for building + Python (v@VER@) modules, extending the Python interpreter or embedding + Python (v@VER@) in applications. + . + Maintainers of Python packages should read README.maintainers. + +Package: lib@PVER@-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: lib@PVER@-stdlib (= ${binary:Version}), lib@PVER@ (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends} +Replaces: @PVER@ (<< 2.7-3), @PVER@-dev (<< 2.7.3-10), @PVER@-minimal (<< 2.7.3-10) +Recommends: libc6-dev | libc-dev +Description: Header files and a static library for Python (v@VER@) + Header files, a static library and development tools for building + Python (v@VER@) modules, extending the Python interpreter or embedding + Python (v@VER@) in applications. + . + Maintainers of Python packages should read README.maintainers. + . + This package contains development files. It is normally not + used on it's own, but as a dependency of @PVER@-dev. + +Package: lib@PVER@-testsuite +Section: libdevel +Architecture: all +Depends: lib@PVER@-stdlib (>= ${binary:Version}), ${misc:Depends} +Suggests: python-gdbm, python-tk +Description: Testsuite for the Python standard library (v@VER@) + The complete testsuite for the Python standard library. Note that + a subset is found in the lib@PVER@-stdlib package, which should + be enough for other packages to use (please do not build-depend + on this package, but file a bug report to include additional + testsuite files in the lib@PVER@-stdlib package). + +Package: idle-@PVER@ +Architecture: all +Depends: @PVER@, python-tk (>= 2.6~a3), @PVER@-tk, ${misc:Depends} +Enhances: @PVER@ +Replaces: @PVER@ (<< 2.6.1-2) +Description: IDE for Python (v@VER@) using Tkinter + IDLE is an Integrated Development Environment for Python (v@VER@). + IDLE is written using Tkinter and therefore quite platform-independent. + +Package: @PVER@-doc +Section: doc +Architecture: all +Depends: libjs-jquery, libjs-underscore, ${misc:Depends} +Suggests: @PVER@ +Description: Documentation for the high-level object-oriented language Python (v@VER@) + These is the official set of documentation for the interactive high-level + object-oriented language Python (v@VER@). All documents are provided + in HTML format. The package consists of ten documents: + . + * What's New in Python@VER@ + * Tutorial + * Python Library Reference + * Macintosh Module Reference + * Python Language Reference + * Extending and Embedding Python + * Python/C API Reference + * Installing Python Modules + * Documenting Python + * Distributing Python Modules + +Package: @PVER@-dbg +Section: debug +Architecture: any +Multi-Arch: allowed +Priority: extra +Depends: @PVER@ (= ${binary:Version}), lib@PVER@-dbg (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: python-gdbm-dbg, python-tk-dbg +Description: Debug Build of the Python Interpreter (version @VER@) + The package holds two things: + . + - A Python interpreter configured with --pydebug. Dynamically loaded modules + are searched as _d.so first. Third party extensions need a separate + build to be used by this interpreter. + - Debug information for standard python interpreter and extensions. + . + See the README.debug for more information. + +Package: lib@PVER@-dbg +Section: debug +Architecture: any +Multi-Arch: same +Priority: extra +Pre-Depends: ${misc:Pre-Depends} +Depends: lib@PVER@-stdlib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: @PVER@-gdbm-dbg, @PVER@-tk-dbg +Replaces: @PVER@-dbg (<< 2.7.3-10) +Description: Debug Build of the Python Interpreter (version @VER@) + The package holds two things: + . + - Extensions for a Python interpreter configured with --pydebug. + - Debug information for standard python extensions. + . + See the README.debug for more information. + --- python2.7-2.7.12.orig/debian/control.stdlib +++ python2.7-2.7.12/debian/control.stdlib @@ -0,0 +1,16 @@ +Package: @PVER@-tk +Architecture: any +Depends: @PVER@ (= ${Source-Version}), ${shlibs:Depends} +Suggests: tix +XB-Python-Version: @VER@ +Description: Tkinter - Writing Tk applications with Python (v@VER@) + A module for writing portable GUI applications with Python (v@VER@) using Tk. + Also known as Tkinter. + +Package: @PVER@-gdbm +Architecture: any +Depends: @PVER@ (= ${Source-Version}), ${shlibs:Depends} +Description: GNU dbm database support for Python (v@VER@) + GNU dbm database module for Python. Install this if you want to + create or read GNU dbm database files with Python. + --- python2.7-2.7.12.orig/debian/copyright +++ python2.7-2.7.12/debian/copyright @@ -0,0 +1,958 @@ +This package was put together by Klee Dienes from +sources from ftp.python.org:/pub/python, based on the Debianization by +the previous maintainers Bernd S. Brentrup and +Bruce Perens. Current maintainer is Matthias Klose . + +It was downloaded from http://python.org/ + +Copyright: + +Upstream Author: Guido van Rossum and others. + +License: + +The following text includes the Python license and licenses and +acknowledgements for incorporated software. The licenses can be read +in the HTML and texinfo versions of the documentation as well, after +installing the pythonx.y-doc package. Licenses for files not licensed +under the Python Licenses are found at the end of this file. + + +Python License +============== + +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.2.3 2.2.2 2003 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + 2.3.1 2.3 2002-2003 PSF yes + 2.3.2 2.3.1 2002-2003 PSF yes + 2.3.3 2.3.2 2002-2003 PSF yes + 2.3.4 2.3.3 2004 PSF yes + 2.3.5 2.3.4 2005 PSF yes + 2.4 2.3 2004 PSF yes + 2.4.1 2.4 2005 PSF yes + 2.4.2 2.4.1 2005 PSF yes + 2.4.3 2.4.2 2006 PSF yes + 2.5 2.4 2006 PSF yes + 2.5.1 2.5 2007 PSF yes + 2.5.2 2.5.1 2008 PSF yes + 2.5.3 2.5.2 2008 PSF yes + 2.6 2.5 2008 PSF yes + 2.6.1 2.6 2008 PSF yes + 2.6.2 2.6.1 2009 PSF yes + 2.6.3 2.6.2 2009 PSF yes + 2.6.4 2.6.3 2009 PSF yes + 2.6.5 2.6.4 2010 PSF yes + 2.7 2.6 2010 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; +All Rights Reserved" are retained in Python alone or in any derivative +version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Licenses and Acknowledgements for Incorporated Software +======================================================= + +Mersenne Twister +---------------- + +The `_random' module includes code based on a download from +`http://www.math.keio.ac.jp/~matumoto/MT2002/emt19937ar.html'. The +following are the verbatim comments from the original code: + + A C-program for MT19937, with initialization improved 2002/1/26. + Coded by Takuji Nishimura and Makoto Matsumoto. + + Before using, initialize the state by using init_genrand(seed) + or init_by_array(init_key, key_length). + + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Any feedback is very welcome. + http://www.math.keio.ac.jp/matumoto/emt.html + email: matumoto@math.keio.ac.jp + + +Sockets +------- + +The `socket' module uses the functions, `getaddrinfo', and +`getnameinfo', which are coded in separate source files from the WIDE +Project, `http://www.wide.ad.jp/about/index.html'. + + Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + GAI_ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + FOR GAI_ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON GAI_ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN GAI_ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + +Floating point exception control +-------------------------------- + +The source for the `fpectl' module includes the following notice: + + --------------------------------------------------------------------- + / Copyright (c) 1996. \ + | The Regents of the University of California. | + | All rights reserved. | + | | + | Permission to use, copy, modify, and distribute this software for | + | any purpose without fee is hereby granted, provided that this en- | + | tire notice is included in all copies of any software which is or | + | includes a copy or modification of this software and in all | + | copies of the supporting documentation for such software. | + | | + | This work was produced at the University of California, Lawrence | + | Livermore National Laboratory under contract no. W-7405-ENG-48 | + | between the U.S. Department of Energy and The Regents of the | + | University of California for the operation of UC LLNL. | + | | + | DISCLAIMER | + | | + | This software was prepared as an account of work sponsored by an | + | agency of the United States Government. Neither the United States | + | Government nor the University of California nor any of their em- | + | ployees, makes any warranty, express or implied, or assumes any | + | liability or responsibility for the accuracy, completeness, or | + | usefulness of any information, apparatus, product, or process | + | disclosed, or represents that its use would not infringe | + | privately-owned rights. Reference herein to any specific commer- | + | cial products, process, or service by trade name, trademark, | + | manufacturer, or otherwise, does not necessarily constitute or | + | imply its endorsement, recommendation, or favoring by the United | + | States Government or the University of California. The views and | + | opinions of authors expressed herein do not necessarily state or | + | reflect those of the United States Government or the University | + | of California, and shall not be used for advertising or product | + \ endorsement purposes. / + --------------------------------------------------------------------- + + +Cookie management +----------------- + +The `Cookie' module contains the following notice: + + Copyright 2000 by Timothy O'Malley + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software + and its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + Timothy O'Malley not be used in advertising or publicity + pertaining to distribution of the software without specific, written + prior permission. + + Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR + ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + +Execution tracing +----------------- + +The `trace' module contains the following notice: + + portions copyright 2001, Autonomous Zones Industries, Inc., all rights... + err... reserved and offered to the public under the terms of the + Python 2.2 license. + Author: Zooko O'Whielacronx + http://zooko.com/ + mailto:zooko@zooko.com + + Copyright 2000, Mojam Media, Inc., all rights reserved. + Author: Skip Montanaro + + Copyright 1999, Bioreason, Inc., all rights reserved. + Author: Andrew Dalke + + Copyright 1995-1997, Automatrix, Inc., all rights reserved. + Author: Skip Montanaro + + Copyright 1991-1995, Stichting Mathematisch Centrum, all rights reserved. + + Permission to use, copy, modify, and distribute this Python software and + its associated documentation for any purpose without fee is hereby + granted, provided that the above copyright notice appears in all copies, + and that both that copyright notice and this permission notice appear in + supporting documentation, and that the name of neither Automatrix, + Bioreason or Mojam Media be used in advertising or publicity pertaining + to distribution of the software without specific, written prior + permission. + + +UUencode and UUdecode functions +------------------------------- + +The `uu' module contains the following notice: + + Copyright 1994 by Lance Ellinghouse + Cathedral City, California Republic, United States of America. + All Rights Reserved + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Lance Ellinghouse + not be used in advertising or publicity pertaining to distribution + of the software without specific, written prior permission. + LANCE ELLINGHOUSE DISCLAIMS ALL WARRANTIES WITH REGARD TO + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL LANCE ELLINGHOUSE CENTRUM BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + Modified by Jack Jansen, CWI, July 1995: + - Use binascii module to do the actual line-by-line conversion + between ascii and binary. This results in a 1000-fold speedup. The C + version is still 5 times faster, though. + - Arguments more compliant with python standard + + +XML Remote Procedure Calls +-------------------------- + +The `xmlrpclib' module contains the following notice: + + The XML-RPC client interface is + + Copyright (c) 1999-2002 by Secret Labs AB + Copyright (c) 1999-2002 by Fredrik Lundh + + By obtaining, using, and/or copying this software and/or its + associated documentation, you agree that you have read, understood, + and will comply with the following terms and conditions: + + Permission to use, copy, modify, and distribute this software and + its associated documentation for any purpose and without fee is + hereby granted, provided that the above copyright notice appears in + all copies, and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + Secret Labs AB or the author not be used in advertising or publicity + pertaining to distribution of the software without specific, written + prior permission. + + SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD + TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- + ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR + BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY + DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. + +Licenses for Software linked to +=============================== + +Note that the choice of GPL compatibility outlined above doesn't extend +to modules linked to particular libraries, since they change the +effective License of the module binary. + + +GNU Readline +------------ + +The 'readline' module makes use of GNU Readline. + + The GNU Readline Library is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + On Debian systems, you can find the complete statement in + /usr/share/doc/readline-common/copyright'. A copy of the GNU General + Public License is available in /usr/share/common-licenses/GPL-2'. + + +OpenSSL +------- + +The '_ssl' module makes use of OpenSSL. + + The OpenSSL toolkit stays under a dual license, i.e. both the + conditions of the OpenSSL License and the original SSLeay license + apply to the toolkit. Actually both licenses are BSD-style Open + Source licenses. Note that both licenses are incompatible with + the GPL. + + On Debian systems, you can find the complete license text in + /usr/share/doc/openssl/copyright'. + + +Files with other licenses than the Python License +------------------------------------------------- + +Files: Lib/profile.py Lib/pstats.py +Copyright: Disney Enterprises, Inc. All Rights Reserved. +License: # Licensed to PSF under a Contributor Agreement + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific language + overning permissions and limitations under the License. + + On Debian systems, the Apache 2.0 license can be found in + /usr/share/common-licenses/Apache-2.0. + +Files: Modules/zlib/* +Copyright: (C) 1995-2010 Jean-loup Gailly and Mark Adler +License: This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* receiving + lengthy legal documents to sign. The sources are provided for free but without + warranty of any kind. The library has been entirely written by Jean-loup + Gailly and Mark Adler; it does not include third-party code. + +Files: Modules/_ctypes/libffi/* +Copyright: Copyright (C) 1996-2009 Red Hat, Inc and others. +License: Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + ``Software''), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Documentation: + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. A copy of the license is included in the + section entitled ``GNU General Public License''. + +Files: Modules/expat/* +Copyright: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers +License: Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: Misc/python-mode.el +Copyright: Copyright (C) 1992,1993,1994 Tim Peters +License: This software is provided as-is, without express or implied + warranty. Permission to use, copy, modify, distribute or sell this + software, without fee, for any purpose and by any individual or + organization, is hereby granted, provided that the above copyright + notice and this paragraph appear in all copies. + +Files: PC/_subprocess.c +Copyright: Copyright (c) 2004 by Fredrik Lundh + Copyright (c) 2004 by Secret Labs AB, http://www.pythonware.com + Copyright (c) 2004 by Peter Astrand +License: + * Permission to use, copy, modify, and distribute this software and + * its associated documentation for any purpose and without fee is + * hereby granted, provided that the above copyright notice appears in + * all copies, and that both that copyright notice and this permission + * notice appear in supporting documentation, and that the name of the + * authors not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. + * + * THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: PC/winsound.c +Copyright: Copyright (c) 1999 Toby Dickenson +License: * Permission to use this software in any way is granted without + * fee, provided that the copyright notice above appears in all + * copies. This software is provided "as is" without any warranty. + */ + +/* Modified by Guido van Rossum */ +/* Beep added by Mark Hammond */ +/* Win9X Beep and platform identification added by Uncle Timmy */ + +Files: Lib/ensurepip/_bundled/setuptools-*.whl +License: see above, some license as Python. + +Files: Lib/ensurepip/_bundled/pip-*.whl +Copyright: Copyright © 2008-2013 The pip developers: + Alex Grönholm + Alex Morega + Alexandre Conrad + Andrey Bulgakov + Antti Kaihola + Armin Ronacher + Aziz Köksal + Ben Rosser + Brian Rosner + Carl Meyer + Chris McDonough + Christian Oudard + Clay McClure + Cody Soyland + Daniel Holth + Dave Abrahams + David (d1b) + Dmitry Gladkov + Donald Stufft + Francesco + Geoffrey Lehée + Georgi Valkov + Hugo Lopes Tavares + Ian Bicking + Igor Sobreira + Ionel Maries Cristian + Jakub Vysoky + James Cleveland + Jannis Leidel + Jay Graves + John-Scott Atlakson + Jon Parise + Jonas Nockert + Josh Bronson + Kamal Bin Mustafa + Kelsey Hightower + Kenneth Belitzky + Kumar McMillan + Luke Macken + Masklinn + Marc Abramowitz + Marcus Smith + Markus Hametner + Matt Maker + Maxime R. + Miguel Araujo + Nick Stenning + Nowell Strite + Oliver Tonnhofer + Olivier Girardot + Patrick Jenkins + Paul Moore + Paul Nasrat + Paul Oswald + Paul van der Linden + Peter Waller + Phil Whelan + Piet Delport + Przemek Wrzos + Qiangning Hong + Rafael Caricio + Rene Dudfield + Roey Berman + Ronny Pfannschmidt + Rory McCann + Simon Cross + Stavros Korokithakis + Thomas Fenzl + Thomas Johansson + Vinay Sajip + Vitaly Babiy + W Trevor King + Wil Tan + Hsiaoming Yang +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/ipaddress.py +Copyright: 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved + 2007 Google Inc. +License: PSF-2 + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/retrying.py +Copyright: (c) 2013-2014, + (c) 2014, Derek Wilson + (c) 2014, Alex Kuang +License: Apache-2 + +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in /usr/share/common-licenses/Apache-2.0. + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/six.py +Copyright: Copyright (c) 2010-2014 Benjamin Peterson +License: Expat + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/cachecontrol +Copyright: 2015 Eric Larson +License: Apache-2.0 + Copyright 2015 Eric Larson + . + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + . + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the license is available at + /usr/share/common-licenses/Apache-2.0 + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/colorama +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/distlib +Copyright: Copyright (C) 2012-2013 The Python Software Foundation + Copyright (C) 2012-2013 Vinay Sajip +License: Python + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/html5lib +html5lib is Copyright (c) 2006 The Authors +Authors: + James Graham - james@hoppipolla.co.uk + Anne van Kesteren - annevankesteren@gmail.com + Lachlan Hunt - lachlan.hunt@lachy.id.au + Matt McDonald - kanashii@kanashii.ca + Sam Ruby - rubys@intertwingly.net + Ian Hickson (Google) - ian@hixie.ch + Thomas Broyer - t.broyer@gmail.com + +License: + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/lockfile +Copyright: + © 2014–2015 OpenStack Foundation + © 2007–2012 Skip Montanaro + © 2008–2014 Ben Finney +License: Expat + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/packaging +Copyright: Copyright (C) 2014 Donald Stufft + Copyright (C) 2012-2013 Vinay Sajip +License: Apache-2.0 + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/progress +Copyright: Copyright (c) 2012 Giorgos Verigakis +License: ISC + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/requests +Copyright: 2016, Kenneth Reitz +License: Apache + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/requests/packages/urllib3/* +Copyright: 2008-2016, Andrey Petrov +License: Expat + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/requests/packages/urllib3/packages/ordered_dict.py +Copyright: 2009, Raymond Hettinger +License: Expat + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py +Copyright: 2011, Python Software Foundation +License: PSF-2 + +Files: Lib/ensurepip/_bundled/pip-*.whl/pip/_vendor/requests/packages/chardet/* +Copyright: 2006-2008, Mark Pilgrim + 2012-2013, Ian Cordasco +License: LGPL-2.1+ --- python2.7-2.7.12.orig/debian/depgraph.py +++ python2.7-2.7.12/debian/depgraph.py @@ -0,0 +1,199 @@ +#! /usr/bin/python + +# Copyright 2004 Toby Dickenson +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +import sys, getopt, colorsys, imp, md5 + +class pydepgraphdot: + + def main(self,argv): + opts,args = getopt.getopt(argv,'',['mono']) + self.colored = 1 + for o,v in opts: + if o=='--mono': + self.colored = 0 + self.render() + + def fix(self,s): + # Convert a module name to a syntactically correct node name + return s.replace('.','_') + + def render(self): + p,t = self.get_data() + + # normalise our input data + for k,d in p.items(): + for v in d.keys(): + if not p.has_key(v): + p[v] = {} + + f = self.get_output_file() + + f.write('digraph G {\n') + #f.write('concentrate = true;\n') + #f.write('ordering = out;\n') + f.write('ranksep=1.0;\n') + f.write('node [style=filled,fontname=Helvetica,fontsize=10];\n') + allkd = p.items() + allkd.sort() + for k,d in allkd: + tk = t.get(k) + if self.use(k,tk): + allv = d.keys() + allv.sort() + for v in allv: + tv = t.get(v) + if self.use(v,tv) and not self.toocommon(v,tv): + f.write('%s -> %s' % ( self.fix(k),self.fix(v) ) ) + self.write_attributes(f,self.edge_attributes(k,v)) + f.write(';\n') + f.write(self.fix(k)) + self.write_attributes(f,self.node_attributes(k,tk)) + f.write(';\n') + f.write('}\n') + + def write_attributes(self,f,a): + if a: + f.write(' [') + f.write(','.join(a)) + f.write(']') + + def node_attributes(self,k,type): + a = [] + a.append('label="%s"' % self.label(k)) + if self.colored: + a.append('fillcolor="%s"' % self.color(k,type)) + else: + a.append('fillcolor=white') + if self.toocommon(k,type): + a.append('peripheries=2') + return a + + def edge_attributes(self,k,v): + a = [] + weight = self.weight(k,v) + if weight!=1: + a.append('weight=%d' % weight) + length = self.alien(k,v) + if length: + a.append('minlen=%d' % length) + return a + + def get_data(self): + t = eval(sys.stdin.read()) + return t['depgraph'],t['types'] + + def get_output_file(self): + return sys.stdout + + def use(self,s,type): + # Return true if this module is interesting and should be drawn. Return false + # if it should be completely omitted. This is a default policy - please override. + if s=='__main__': + return 0 + #if s in ('os','sys','time','__future__','types','re','string'): + if s in ('sys'): + # nearly all modules use all of these... more or less. They add nothing to + # our diagram. + return 0 + if s.startswith('encodings.'): + return 0 + if self.toocommon(s,type): + # A module where we dont want to draw references _to_. Dot doesnt handle these + # well, so it is probably best to not draw them at all. + return 0 + return 1 + + def toocommon(self,s,type): + # Return true if references to this module are uninteresting. Such references + # do not get drawn. This is a default policy - please override. + # + if s=='__main__': + # references *to* __main__ are never interesting. omitting them means + # that main floats to the top of the page + return 1 + #if type==imp.PKG_DIRECTORY: + # # dont draw references to packages. + # return 1 + return 0 + + def weight(self,a,b): + # Return the weight of the dependency from a to b. Higher weights + # usually have shorter straighter edges. Return 1 if it has normal weight. + # A value of 4 is usually good for ensuring that a related pair of modules + # are drawn next to each other. This is a default policy - please override. + # + if b.split('.')[-1].startswith('_'): + # A module that starts with an underscore. You need a special reason to + # import these (for example random imports _random), so draw them close + # together + return 4 + return 1 + + def alien(self,a,b): + # Return non-zero if references to this module are strange, and should be drawn + # extra-long. the value defines the length, in rank. This is also good for putting some + # vertical space between seperate subsystems. This is a default policy - please override. + # + return 0 + + def label(self,s): + # Convert a module name to a formatted node label. This is a default policy - please override. + # + return '\\.\\n'.join(s.split('.')) + + def color(self,s,type): + # Return the node color for this module name. This is a default policy - please override. + # + # Calculate a color systematically based on the hash of the module name. Modules in the + # same package have the same color. Unpackaged modules are grey + t = self.normalise_module_name_for_hash_coloring(s,type) + return self.color_from_name(t) + + def normalise_module_name_for_hash_coloring(self,s,type): + if type==imp.PKG_DIRECTORY: + return s + else: + i = s.rfind('.') + if i<0: + return '' + else: + return s[:i] + + def color_from_name(self,name): + n = md5.md5(name).digest() + hf = float(ord(n[0])+ord(n[1])*0xff)/0xffff + sf = float(ord(n[2]))/0xff + vf = float(ord(n[3]))/0xff + r,g,b = colorsys.hsv_to_rgb(hf, 0.3+0.6*sf, 0.8+0.2*vf) + return '#%02x%02x%02x' % (r*256,g*256,b*256) + + +def main(): + pydepgraphdot().main(sys.argv[1:]) + +if __name__=='__main__': + main() + + + --- python2.7-2.7.12.orig/debian/dh_doclink +++ python2.7-2.7.12/debian/dh_doclink @@ -0,0 +1,28 @@ +#! /bin/sh + +pkg=`echo $1 | sed 's/^-p//'` +target=$2 + +ln -sf $target debian/$pkg/usr/share/doc/$pkg + +f=debian/$pkg.postinst.debhelper +if [ ! -e $f ] || [ "`grep -c '^# dh_doclink' $f`" -eq 0 ]; then +cat >> $f <> $f < /dev/null`; do \ + while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \ +done + +exit 0 --- python2.7-2.7.12.orig/debian/idle-PVER.1.in +++ python2.7-2.7.12/debian/idle-PVER.1.in @@ -0,0 +1,104 @@ +.TH IDLE 1 "21 September 2004" +.SH NAME +\fBIDLE\fP \- An Integrated DeveLopment Environment for Python +.SH SYNTAX +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] [ \fIfile\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] ( \fI-c cmd\fP | \fI-r file\fP ) [ \fIarg\fP ...] +.PP +.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] - [ \fIarg\fP ...] +.SH DESCRIPTION +This manual page documents briefly the +.BR idle +command. +This manual page was written for Debian +because the original program does not have a manual page. +For more information, refer to IDLE's help menu. +.PP +.B IDLE +is an Integrated DeveLopment Environment for Python. IDLE is based on +Tkinter, Python's bindings to the Tk widget set. Features are 100% pure +Python, multi-windows with multiple undo and Python colorizing, a Python +shell window subclass, a debugger. IDLE is cross-platform, i.e. it works +on all platforms where Tk is installed. +.LP +.SH OPTIONS +.TP +.B \-h +.PD +Print this help message and exit. +.TP +.B \-n +.PD +Run IDLE without a subprocess (see Help/IDLE Help for details). +.PP +The following options will override the IDLE 'settings' configuration: +.TP +.B \-e +.PD +Open an edit window. +.TP +.B \-i +.PD +Open a shell window. +.PP +The following options imply -i and will open a shell: +.TP +.B \-c cmd +.PD +Run the command in a shell, or +.TP +.B \-r file +.PD +Run script from file. +.PP +.TP +.B \-d +.PD +Enable the debugger. +.TP +.B \-s +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP before anything else. +.TP +.B \-t title +.PD +Set title of shell window. +.PP +A default edit window will be bypassed when -c, -r, or - are used. +.PP +[arg]* and [file]* are passed to the command (-c) or script (-r) in sys.argv[1:]. +.SH EXAMPLES +.TP +idle +.PD +Open an edit window or shell depending on IDLE's configuration. +.TP +idle foo.py foobar.py +.PD +Edit the files, also open a shell if configured to start with shell. +.TP +idle -est "Baz" foo.py +.PD +Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell +window with the title "Baz". +.TP +idle -c "import sys; print sys.argv" "foo" +.PD +Open a shell window and run the command, passing "-c" in sys.argv[0] +and "foo" in sys.argv[1]. +.TP +idle -d -s -r foo.py "Hello World" +.PD +Open a shell window, run a startup script, enable the debugger, and +run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in +sys.argv[1]. +.TP +echo "import sys; print sys.argv" | idle - "foobar" +.PD +Open a shell window, run the script piped in, passing '' in sys.argv[0] +and "foobar" in sys.argv[1]. +.SH SEE ALSO +python(1). +.SH AUTHORS +Various. --- python2.7-2.7.12.orig/debian/idle-PVER.overrides.in +++ python2.7-2.7.12/debian/idle-PVER.overrides.in @@ -0,0 +1,3 @@ +# icon in dependent package +idle-@PVER@ binary: menu-icon-missing +idle-@PVER@ binary: image-file-in-usr-lib --- python2.7-2.7.12.orig/debian/idle-PVER.postinst.in +++ python2.7-2.7.12/debian/idle-PVER.postinst.in @@ -0,0 +1,32 @@ +#! /bin/sh +# +# postinst script for the Debian idle-@PVER@ package. +# Written 1998 by Gregor Hoffleit . +# + +set -e + +DIRLIST="/usr/lib/python@VER@/idlelib" + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + + for i in $DIRLIST ; do + @PVER@ /usr/lib/@PVER@/compileall.py -q $i + if grep -sq '^byte-compile[^#]*optimize' /etc/python/debian_config + then + @PVER@ -O /usr/lib/@PVER@/compileall.py -q $i + fi + done + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/idle-PVER.postrm.in +++ python2.7-2.7.12/debian/idle-PVER.postrm.in @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf /etc/idle-@PVER@ +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/idle-PVER.prerm.in +++ python2.7-2.7.12/debian/idle-PVER.prerm.in @@ -0,0 +1,17 @@ +#! /bin/sh +# +# sample prerm script for the Debian idle-@PVER@ package. +# Written 1998 by Gregor Hoffleit . +# + +set -e + +PACKAGE=`basename $0 .prerm` + +dpkg --listfiles $PACKAGE | + awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | + xargs rm -f >&2 + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/idle.desktop.in +++ python2.7-2.7.12/debian/idle.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=IDLE (using Python-@VER@) +Comment=Integrated Development Environment for Python (using Python-@VER@) +Exec=/usr/bin/idle-@PVER@ +Icon=/usr/share/pixmaps/@PVER@.xpm +Terminal=false +Type=Application +Categories=Application;Development; +StartupNotify=true --- python2.7-2.7.12.orig/debian/libPVER-dbg.overrides.in +++ python2.7-2.7.12/debian/libPVER-dbg.overrides.in @@ -0,0 +1,7 @@ +lib@PVER@-dbg binary: package-name-doesnt-match-sonames +lib@PVER@-dbg binary: non-dev-pkg-with-shlib-symlink + +lib@PVER@-dbg binary: arch-dependent-file-not-in-arch-specific-directory + +# pointless lintian ... +lib@PVER@-dbg binary: hardening-no-fortify-functions --- python2.7-2.7.12.orig/debian/libPVER-dbg.postinst.in +++ python2.7-2.7.12/debian/libPVER-dbg.postinst.in @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +if [ "$1" = configure ]; then + # _sysconfigdata_d.py now found in the platform directory + rm -f /usr/lib/python2.7/_sysconfigdata_d.py[co] +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/libPVER-dbg.prerm.in +++ python2.7-2.7.12/debian/libPVER-dbg.prerm.in @@ -0,0 +1,23 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + dpkg -L lib@PVER@-dbg@HOST_QUAL@ \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 + ;; + upgrade) + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/libPVER-dbg.symbols.in +++ python2.7-2.7.12/debian/libPVER-dbg.symbols.in @@ -0,0 +1,33 @@ +libpython@VER@_d.so.1.0 libpython@VER@-dbg #MINVER# + Py_InitModule4TraceRefs@Base @VER@ +#include "libpython.symbols" + _PyDict_Dummy@Base @VER@ + _PyMem_DebugFree@Base @VER@ + _PyMem_DebugMalloc@Base @VER@ + _PyMem_DebugRealloc@Base @VER@ + _PyObject_DebugCheckAddress@Base @VER@ + _PyObject_DebugCheckAddressApi@Base @VER@ + _PyObject_DebugDumpAddress@Base @VER@ + _PyObject_DebugFree@Base @VER@ + _PyObject_DebugFreeApi@Base @VER@ + _PyObject_DebugMalloc@Base @VER@ + _PyObject_DebugMallocApi@Base @VER@ + _PyObject_DebugMallocStats@Base @VER@ + _PyObject_DebugRealloc@Base @VER@ + _PyObject_DebugReallocApi@Base @VER@ + _PySet_Dummy@Base @VER@ + _Py_AddToAllObjects@Base @VER@ + _Py_Dealloc@Base @VER@ + _Py_ForgetReference@Base @VER@ + _Py_GetObjects@Base @VER@ + _Py_GetRefTotal@Base @VER@ + _Py_HashSecret_Initialized@Base @VER@ + _Py_NegativeRefcount@Base @VER@ + _Py_NewReference@Base @VER@ + _Py_PrintReferenceAddresses@Base @VER@ + _Py_PrintReferences@Base @VER@ + _Py_RefTotal@Base @VER@ + _Py_dumptree@Base @VER@ + _Py_printtree@Base @VER@ + _Py_showtree@Base @VER@ + _Py_tok_dump@Base @VER@ --- python2.7-2.7.12.orig/debian/libPVER-dev.overrides.in +++ python2.7-2.7.12/debian/libPVER-dev.overrides.in @@ -0,0 +1,3 @@ +lib@PVER@-dev binary: python-script-but-no-python-dep + +lib@PVER@-dev binary: arch-dependent-file-not-in-arch-specific-directory --- python2.7-2.7.12.orig/debian/libPVER-minimal.overrides.in +++ python2.7-2.7.12/debian/libPVER-minimal.overrides.in @@ -0,0 +1 @@ +lib@PVER@-minimal binary: python-script-but-no-python-dep --- python2.7-2.7.12.orig/debian/libPVER-minimal.postinst.in +++ python2.7-2.7.12/debian/libPVER-minimal.postinst.in @@ -0,0 +1,17 @@ +#! /bin/sh + +set -e + +if [ ! -f /etc/@PVER@/sitecustomize.py ]; then + cat <<-EOF + # Empty sitecustomize.py to avoid a dangling symlink +EOF +fi + +if [ "$1" = configure ]; then + rm -f /etc/@PVER@/cert-verification.conf +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/libPVER-minimal.postrm.in +++ python2.7-2.7.12/debian/libPVER-minimal.postrm.in @@ -0,0 +1,27 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + find /usr/lib/@PVER@ -name '*.py[co]' -print0 | xargs -r0 rm -f + fi +fi + +if [ "$1" = "purge" ]; then + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + rm -f /etc/@PVER@/site.py /etc/@PVER@/sitecustomize.py + if [ -d /etc/@PVER@ ]; then + rmdir --ignore-fail-on-non-empty /etc/@PVER@ 2>/dev/null + fi + fi + rm -f /etc/@PVER@/cert-verification.conf +fi + +#DEBHELPER# + +exit 0 --- python2.7-2.7.12.orig/debian/libPVER-minimal.prerm.in +++ python2.7-2.7.12/debian/libPVER-minimal.prerm.in @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-minimal \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + remove_bytecode lib@PVER@-minimal@HOST_QUAL@ + fi + ;; + upgrade) + remove_bytecode lib@PVER@-minimal@HOST_QUAL@ + # byte compilation in @PVER@-minimal postinst, strict dependency + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/libPVER-stdlib.overrides.in +++ python2.7-2.7.12/debian/libPVER-stdlib.overrides.in @@ -0,0 +1,14 @@ +# idlelib images +lib@PVER@-stdlib binary: image-file-in-usr-lib + +# license file referred by the standard library +lib@PVER@-stdlib binary: extra-license-file + +# template files +lib@PVER@-stdlib binary: interpreter-not-absolute usr/lib/python3.3/venv/scripts/posix/pydoc #!__VENV_PYTHON__ +lib@PVER@-stdlib binary: unusual-interpreter usr/lib/python3.3/venv/scripts/posix/pydoc #!__VENV_PYTHON__ + +# the split is the reason for that +lib@PVER@-stdlib binary: python-script-but-no-python-dep + +lib@PVER@-stdlib binary: arch-dependent-file-not-in-arch-specific-directory --- python2.7-2.7.12.orig/debian/libPVER-stdlib.prerm.in +++ python2.7-2.7.12/debian/libPVER-stdlib.prerm.in @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + pc=$(dpkg-query -f '${db:Status-Abbrev} ${binary:Package}\n' -W lib@PVER@-stdlib \ + | grep -v '^.n' | wc -l) + if [ "$pc" -le 1 ]; then + remove_bytecode lib@PVER@-stdlib@HOST_QUAL@ + fi + ;; + upgrade) + remove_bytecode lib@PVER@-stdlib@HOST_QUAL@ + # byte compilation in @PVER@ postinst, strict dependency + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/libPVER-testsuite.overrides.in +++ python2.7-2.7.12/debian/libPVER-testsuite.overrides.in @@ -0,0 +1,2 @@ +lib@PVER@-testsuite binary: python-script-but-no-python-dep +lib@PVER@-testsuite binary: image-file-in-usr-lib --- python2.7-2.7.12.orig/debian/libPVER-testsuite.prerm.in +++ python2.7-2.7.12/debian/libPVER-testsuite.prerm.in @@ -0,0 +1,30 @@ +#! /bin/sh + +set -e + +remove_bytecode() +{ + pkg=$1 + dpkg -L $1 \ + | awk '/\.py$/ {print $0"c\n" $0"o"}' \ + | xargs -r rm -f >&2 +} + +case "$1" in + remove) + remove_bytecode lib@PVER@-testsuite + ;; + upgrade) + remove_bytecode lib@PVER@-testsuite + ;; + deconfigure) + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- python2.7-2.7.12.orig/debian/libPVER.overrides.in +++ python2.7-2.7.12/debian/libPVER.overrides.in @@ -0,0 +1 @@ +lib@PVER@ binary: package-name-doesnt-match-sonames --- python2.7-2.7.12.orig/debian/libPVER.symbols.in +++ python2.7-2.7.12/debian/libPVER.symbols.in @@ -0,0 +1,3 @@ +libpython@VER@.so.1.0 libpython@VER@ #MINVER# + Py_InitModule4@Base @VER@ +#include "libpython.symbols" --- python2.7-2.7.12.orig/debian/libpython.symbols.in +++ python2.7-2.7.12/debian/libpython.symbols.in @@ -0,0 +1,1348 @@ + PyAST_Check@Base @VER@ + PyAST_Compile@Base @VER@ + PyAST_FromNode@Base @VER@ + PyAST_mod2obj@Base @VER@ + PyAST_obj2mod@Base @VER@ + PyArena_AddPyObject@Base @VER@ + PyArena_Free@Base @VER@ + PyArena_Malloc@Base @VER@ + PyArena_New@Base @VER@ + PyArg_Parse@Base @VER@ + PyArg_ParseTuple@Base @VER@ + PyArg_ParseTupleAndKeywords@Base @VER@ + PyArg_UnpackTuple@Base @VER@ + PyArg_VaParse@Base @VER@ + PyArg_VaParseTupleAndKeywords@Base @VER@ + PyBaseObject_Type@Base @VER@ + PyBaseString_Type@Base @VER@ + PyBool_FromLong@Base @VER@ + PyBool_Type@Base @VER@ + PyBuffer_FillContiguousStrides@Base @VER@ + PyBuffer_FillInfo@Base @VER@ + PyBuffer_FromContiguous@Base @VER@ + PyBuffer_FromMemory@Base @VER@ + PyBuffer_FromObject@Base @VER@ + PyBuffer_FromReadWriteMemory@Base @VER@ + PyBuffer_FromReadWriteObject@Base @VER@ + PyBuffer_GetPointer@Base @VER@ + PyBuffer_IsContiguous@Base @VER@ + PyBuffer_New@Base @VER@ + PyBuffer_Release@Base @VER@ + PyBuffer_ToContiguous@Base @VER@ + PyBuffer_Type@Base @VER@ + (optional)PyBufferedIOBase_Type@Base @VER@ + (optional)PyBufferedRWPair_Type@Base @VER@ + (optional)PyBufferedRandom_Type@Base @VER@ + (optional)PyBufferedReader_Type@Base @VER@ + (optional)PyBufferedWriter_Type@Base @VER@ + PyByteArrayIter_Type@Base @VER@ + PyByteArray_AsString@Base @VER@ + PyByteArray_Concat@Base @VER@ + PyByteArray_Fini@Base @VER@ + PyByteArray_FromObject@Base @VER@ + PyByteArray_FromStringAndSize@Base @VER@ + PyByteArray_Init@Base @VER@ + PyByteArray_Resize@Base @VER@ + PyByteArray_Size@Base @VER@ + PyByteArray_Type@Base @VER@ + (optional)PyBytesIO_Type@Base @VER@ + PyCFunction_Call@Base @VER@ + PyCFunction_ClearFreeList@Base @VER@ + PyCFunction_Fini@Base @VER@ + PyCFunction_GetFlags@Base @VER@ + PyCFunction_GetFunction@Base @VER@ + PyCFunction_GetSelf@Base @VER@ + PyCFunction_New@Base @VER@ + PyCFunction_NewEx@Base @VER@ + PyCFunction_Type@Base @VER@ + PyCObject_AsVoidPtr@Base @VER@ + PyCObject_FromVoidPtr@Base @VER@ + PyCObject_FromVoidPtrAndDesc@Base @VER@ + PyCObject_GetDesc@Base @VER@ + PyCObject_Import@Base @VER@ + PyCObject_SetVoidPtr@Base @VER@ + PyCObject_Type@Base @VER@ + PyCallIter_New@Base @VER@ + PyCallIter_Type@Base @VER@ + PyCallable_Check@Base @VER@ + PyCapsule_GetContext@Base @VER@ + PyCapsule_GetDestructor@Base @VER@ + PyCapsule_GetName@Base @VER@ + PyCapsule_GetPointer@Base @VER@ + PyCapsule_Import@Base @VER@ + PyCapsule_IsValid@Base @VER@ + PyCapsule_New@Base @VER@ + PyCapsule_SetContext@Base @VER@ + PyCapsule_SetDestructor@Base @VER@ + PyCapsule_SetName@Base @VER@ + PyCapsule_SetPointer@Base @VER@ + PyCapsule_Type@Base @VER@ + PyCell_Get@Base @VER@ + PyCell_New@Base @VER@ + PyCell_Set@Base @VER@ + PyCell_Type@Base @VER@ + PyClassMethod_New@Base @VER@ + PyClassMethod_Type@Base @VER@ + PyClass_IsSubclass@Base @VER@ + PyClass_New@Base @VER@ + PyClass_Type@Base @VER@ + PyCode_Addr2Line@Base @VER@ + PyCode_New@Base @VER@ + PyCode_NewEmpty@Base @VER@ + PyCode_Optimize@Base @VER@ + PyCode_Type@Base @VER@ + PyCodec_BackslashReplaceErrors@Base @VER@ + PyCodec_Decode@Base @VER@ + PyCodec_Decoder@Base @VER@ + PyCodec_Encode@Base @VER@ + PyCodec_Encoder@Base @VER@ + PyCodec_IgnoreErrors@Base @VER@ + PyCodec_IncrementalDecoder@Base @VER@ + PyCodec_IncrementalEncoder@Base @VER@ + PyCodec_LookupError@Base @VER@ + PyCodec_Register@Base @VER@ + PyCodec_RegisterError@Base @VER@ + PyCodec_ReplaceErrors@Base @VER@ + PyCodec_StreamReader@Base @VER@ + PyCodec_StreamWriter@Base @VER@ + PyCodec_StrictErrors@Base @VER@ + PyCodec_XMLCharRefReplaceErrors@Base @VER@ + PyComplex_AsCComplex@Base @VER@ + PyComplex_FromCComplex@Base @VER@ + PyComplex_FromDoubles@Base @VER@ + PyComplex_ImagAsDouble@Base @VER@ + PyComplex_RealAsDouble@Base @VER@ + PyComplex_Type@Base @VER@ + PyDescr_NewClassMethod@Base @VER@ + PyDescr_NewGetSet@Base @VER@ + PyDescr_NewMember@Base @VER@ + PyDescr_NewMethod@Base @VER@ + PyDescr_NewWrapper@Base @VER@ + PyDictItems_Type@Base @VER@ + PyDictIterItem_Type@Base @VER@ + PyDictIterKey_Type@Base @VER@ + PyDictIterValue_Type@Base @VER@ + PyDictKeys_Type@Base @VER@ + PyDictProxy_New@Base @VER@ + PyDictProxy_Type@Base @VER@ + PyDictValues_Type@Base @VER@ + PyDict_Clear@Base @VER@ + PyDict_Contains@Base @VER@ + PyDict_Copy@Base @VER@ + PyDict_DelItem@Base @VER@ + PyDict_DelItemString@Base @VER@ + PyDict_Fini@Base @VER@ + PyDict_GetItem@Base @VER@ + PyDict_GetItemString@Base @VER@ + PyDict_Items@Base @VER@ + PyDict_Keys@Base @VER@ + PyDict_Merge@Base @VER@ + PyDict_MergeFromSeq2@Base @VER@ + PyDict_New@Base @VER@ + PyDict_Next@Base @VER@ + PyDict_SetItem@Base @VER@ + PyDict_SetItemString@Base @VER@ + PyDict_Size@Base @VER@ + PyDict_Type@Base @VER@ + PyDict_Update@Base @VER@ + PyDict_Values@Base @VER@ + PyEllipsis_Type@Base @VER@ + PyEnum_Type@Base @VER@ + PyErr_BadArgument@Base @VER@ + PyErr_BadInternalCall@Base @VER@ + PyErr_CheckSignals@Base @VER@ + PyErr_Clear@Base @VER@ + PyErr_Display@Base @VER@ + PyErr_ExceptionMatches@Base @VER@ + PyErr_Fetch@Base @VER@ + PyErr_Format@Base @VER@ + PyErr_GivenExceptionMatches@Base @VER@ + PyErr_NewException@Base @VER@ + PyErr_NewExceptionWithDoc@Base @VER@ + PyErr_NoMemory@Base @VER@ + PyErr_NormalizeException@Base @VER@ + PyErr_Occurred@Base @VER@ + PyErr_Print@Base @VER@ + PyErr_PrintEx@Base @VER@ + PyErr_ProgramText@Base @VER@ + PyErr_Restore@Base @VER@ + PyErr_SetFromErrno@Base @VER@ + PyErr_SetFromErrnoWithFilename@Base @VER@ + PyErr_SetFromErrnoWithFilenameObject@Base @VER@ + PyErr_SetInterrupt@Base @VER@ + PyErr_SetNone@Base @VER@ + PyErr_SetObject@Base @VER@ + PyErr_SetString@Base @VER@ + PyErr_SyntaxLocation@Base @VER@ + PyErr_Warn@Base @VER@ + PyErr_WarnEx@Base @VER@ + PyErr_WarnExplicit@Base @VER@ + PyErr_WriteUnraisable@Base @VER@ + PyEval_AcquireLock@Base @VER@ + PyEval_AcquireThread@Base @VER@ + PyEval_CallFunction@Base @VER@ + PyEval_CallMethod@Base @VER@ + PyEval_CallObjectWithKeywords@Base @VER@ + PyEval_EvalCode@Base @VER@ + PyEval_EvalCodeEx@Base @VER@ + PyEval_EvalFrame@Base @VER@ + PyEval_EvalFrameEx@Base @VER@ + PyEval_GetBuiltins@Base @VER@ + PyEval_GetCallStats@Base @VER@ + PyEval_GetFrame@Base @VER@ + PyEval_GetFuncDesc@Base @VER@ + PyEval_GetFuncName@Base @VER@ + PyEval_GetGlobals@Base @VER@ + PyEval_GetLocals@Base @VER@ + PyEval_GetRestricted@Base @VER@ + PyEval_InitThreads@Base @VER@ + PyEval_MergeCompilerFlags@Base @VER@ + PyEval_ReInitThreads@Base @VER@ + PyEval_ReleaseLock@Base @VER@ + PyEval_ReleaseThread@Base @VER@ + PyEval_RestoreThread@Base @VER@ + PyEval_SaveThread@Base @VER@ + PyEval_SetProfile@Base @VER@ + PyEval_SetTrace@Base @VER@ + PyEval_ThreadsInitialized@Base @VER@ + PyExc_ArithmeticError@Base @VER@ + PyExc_AssertionError@Base @VER@ + PyExc_AttributeError@Base @VER@ + PyExc_BaseException@Base @VER@ + (optional)PyExc_BlockingIOError@Base @VER@ + PyExc_BufferError@Base @VER@ + PyExc_BytesWarning@Base @VER@ + PyExc_DeprecationWarning@Base @VER@ + PyExc_EOFError@Base @VER@ + PyExc_EnvironmentError@Base @VER@ + PyExc_Exception@Base @VER@ + PyExc_FloatingPointError@Base @VER@ + PyExc_FutureWarning@Base @VER@ + PyExc_GeneratorExit@Base @VER@ + PyExc_IOError@Base @VER@ + PyExc_ImportError@Base @VER@ + PyExc_ImportWarning@Base @VER@ + PyExc_IndentationError@Base @VER@ + PyExc_IndexError@Base @VER@ + PyExc_KeyError@Base @VER@ + PyExc_KeyboardInterrupt@Base @VER@ + PyExc_LookupError@Base @VER@ + PyExc_MemoryError@Base @VER@ + PyExc_MemoryErrorInst@Base @VER@ + PyExc_NameError@Base @VER@ + PyExc_NotImplementedError@Base @VER@ + PyExc_OSError@Base @VER@ + PyExc_OverflowError@Base @VER@ + PyExc_PendingDeprecationWarning@Base @VER@ + PyExc_RecursionErrorInst@Base @VER@ + PyExc_ReferenceError@Base @VER@ + PyExc_RuntimeError@Base @VER@ + PyExc_RuntimeWarning@Base @VER@ + PyExc_StandardError@Base @VER@ + PyExc_StopIteration@Base @VER@ + PyExc_SyntaxError@Base @VER@ + PyExc_SyntaxWarning@Base @VER@ + PyExc_SystemError@Base @VER@ + PyExc_SystemExit@Base @VER@ + PyExc_TabError@Base @VER@ + PyExc_TypeError@Base @VER@ + PyExc_UnboundLocalError@Base @VER@ + PyExc_UnicodeDecodeError@Base @VER@ + PyExc_UnicodeEncodeError@Base @VER@ + PyExc_UnicodeError@Base @VER@ + PyExc_UnicodeTranslateError@Base @VER@ + PyExc_UnicodeWarning@Base @VER@ + PyExc_UserWarning@Base @VER@ + PyExc_ValueError@Base @VER@ + PyExc_Warning@Base @VER@ + PyExc_ZeroDivisionError@Base @VER@ + (optional)PyFileIO_Type@Base @VER@ + PyFile_AsFile@Base @VER@ + PyFile_DecUseCount@Base @VER@ + PyFile_FromFile@Base @VER@ + PyFile_FromString@Base @VER@ + PyFile_GetLine@Base @VER@ + PyFile_IncUseCount@Base @VER@ + PyFile_Name@Base @VER@ + PyFile_SetBufSize@Base @VER@ + PyFile_SetEncoding@Base @VER@ + PyFile_SetEncodingAndErrors@Base @VER@ + PyFile_SoftSpace@Base @VER@ + PyFile_Type@Base @VER@ + PyFile_WriteObject@Base @VER@ + PyFile_WriteString@Base @VER@ + PyFloat_AsDouble@Base @VER@ + PyFloat_AsReprString@Base @VER@ + PyFloat_AsString@Base @VER@ + PyFloat_ClearFreeList@Base @VER@ + PyFloat_Fini@Base @VER@ + PyFloat_FromDouble@Base @VER@ + PyFloat_FromString@Base @VER@ + PyFloat_GetInfo@Base @VER@ + PyFloat_GetMax@Base @VER@ + PyFloat_GetMin@Base @VER@ + PyFloat_Type@Base @VER@ + PyFrame_BlockPop@Base @VER@ + PyFrame_BlockSetup@Base @VER@ + PyFrame_ClearFreeList@Base @VER@ + PyFrame_FastToLocals@Base @VER@ + PyFrame_Fini@Base @VER@ + PyFrame_GetLineNumber@Base @VER@ + PyFrame_LocalsToFast@Base @VER@ + PyFrame_New@Base @VER@ + PyFrame_Type@Base @VER@ + PyFrozenSet_New@Base @VER@ + PyFrozenSet_Type@Base @VER@ + PyFunction_GetClosure@Base @VER@ + PyFunction_GetCode@Base @VER@ + PyFunction_GetDefaults@Base @VER@ + PyFunction_GetGlobals@Base @VER@ + PyFunction_GetModule@Base @VER@ + PyFunction_New@Base @VER@ + PyFunction_SetClosure@Base @VER@ + PyFunction_SetDefaults@Base @VER@ + PyFunction_Type@Base @VER@ + PyFuture_FromAST@Base @VER@ + PyGC_Collect@Base @VER@ + PyGILState_Ensure@Base @VER@ + PyGILState_GetThisThreadState@Base @VER@ + PyGILState_Release@Base @VER@ + PyGen_NeedsFinalizing@Base @VER@ + PyGen_New@Base @VER@ + PyGen_Type@Base @VER@ + PyGetSetDescr_Type@Base @VER@ + PyGrammar_AddAccelerators@Base @VER@ + PyGrammar_FindDFA@Base @VER@ + PyGrammar_LabelRepr@Base @VER@ + PyGrammar_RemoveAccelerators@Base @VER@ + (optional)PyIOBase_Type@Base @VER@ + PyImport_AddModule@Base @VER@ + PyImport_AppendInittab@Base @VER@ + PyImport_Cleanup@Base @VER@ + PyImport_ExecCodeModule@Base @VER@ + PyImport_ExecCodeModuleEx@Base @VER@ + PyImport_ExtendInittab@Base @VER@ + PyImport_FrozenModules@Base @VER@ + PyImport_GetImporter@Base @VER@ + PyImport_GetMagicNumber@Base @VER@ + PyImport_GetModuleDict@Base @VER@ + PyImport_Import@Base @VER@ + PyImport_ImportFrozenModule@Base @VER@ + PyImport_ImportModule@Base @VER@ + PyImport_ImportModuleLevel@Base @VER@ + PyImport_ImportModuleNoBlock@Base @VER@ + PyImport_Inittab@Base @VER@ + PyImport_ReloadModule@Base @VER@ + (optional)PyIncrementalNewlineDecoder_Type@Base @VER@ + PyInstance_New@Base @VER@ + PyInstance_NewRaw@Base @VER@ + PyInstance_Type@Base @VER@ + PyInt_AsLong@Base @VER@ + PyInt_AsSsize_t@Base @VER@ + PyInt_AsUnsignedLongLongMask@Base @VER@ + PyInt_AsUnsignedLongMask@Base @VER@ + PyInt_ClearFreeList@Base @VER@ + PyInt_Fini@Base @VER@ + PyInt_FromLong@Base @VER@ + PyInt_FromSize_t@Base @VER@ + PyInt_FromSsize_t@Base @VER@ + PyInt_FromString@Base @VER@ + PyInt_FromUnicode@Base @VER@ + PyInt_GetMax@Base @VER@ + PyInt_Type@Base @VER@ + PyInterpreterState_Clear@Base @VER@ + PyInterpreterState_Delete@Base @VER@ + PyInterpreterState_Head@Base @VER@ + PyInterpreterState_New@Base @VER@ + PyInterpreterState_Next@Base @VER@ + PyInterpreterState_ThreadHead@Base @VER@ + PyIter_Next@Base @VER@ + PyListIter_Type@Base @VER@ + PyListRevIter_Type@Base @VER@ + PyList_Append@Base @VER@ + PyList_AsTuple@Base @VER@ + PyList_Fini@Base @VER@ + PyList_GetItem@Base @VER@ + PyList_GetSlice@Base @VER@ + PyList_Insert@Base @VER@ + PyList_New@Base @VER@ + PyList_Reverse@Base @VER@ + PyList_SetItem@Base @VER@ + PyList_SetSlice@Base @VER@ + PyList_Size@Base @VER@ + PyList_Sort@Base @VER@ + PyList_Type@Base @VER@ + PyLong_AsDouble@Base @VER@ + PyLong_AsLong@Base @VER@ + PyLong_AsLongAndOverflow@Base @VER@ + PyLong_AsLongLong@Base @VER@ + PyLong_AsLongLongAndOverflow@Base @VER@ + PyLong_AsSsize_t@Base @VER@ + PyLong_AsUnsignedLong@Base @VER@ + PyLong_AsUnsignedLongLong@Base @VER@ + PyLong_AsUnsignedLongLongMask@Base @VER@ + PyLong_AsUnsignedLongMask@Base @VER@ + PyLong_AsVoidPtr@Base @VER@ + PyLong_FromDouble@Base @VER@ + PyLong_FromLong@Base @VER@ + PyLong_FromLongLong@Base @VER@ + PyLong_FromSize_t@Base @VER@ + PyLong_FromSsize_t@Base @VER@ + PyLong_FromString@Base @VER@ + PyLong_FromUnicode@Base @VER@ + PyLong_FromUnsignedLong@Base @VER@ + PyLong_FromUnsignedLongLong@Base @VER@ + PyLong_FromVoidPtr@Base @VER@ + PyLong_GetInfo@Base @VER@ + PyLong_Type@Base @VER@ + PyMapping_Check@Base @VER@ + PyMapping_GetItemString@Base @VER@ + PyMapping_HasKey@Base @VER@ + PyMapping_HasKeyString@Base @VER@ + PyMapping_Length@Base @VER@ + PyMapping_SetItemString@Base @VER@ + PyMapping_Size@Base @VER@ + PyMarshal_Init@Base @VER@ + PyMarshal_ReadLastObjectFromFile@Base @VER@ + PyMarshal_ReadLongFromFile@Base @VER@ + PyMarshal_ReadObjectFromFile@Base @VER@ + PyMarshal_ReadObjectFromString@Base @VER@ + PyMarshal_ReadShortFromFile@Base @VER@ + PyMarshal_WriteLongToFile@Base @VER@ + PyMarshal_WriteObjectToFile@Base @VER@ + PyMarshal_WriteObjectToString@Base @VER@ + PyMem_Free@Base @VER@ + PyMem_Malloc@Base @VER@ + PyMem_Realloc@Base @VER@ + PyMemberDescr_Type@Base @VER@ + PyMember_Get@Base @VER@ + PyMember_GetOne@Base @VER@ + PyMember_Set@Base @VER@ + PyMember_SetOne@Base @VER@ + PyMemoryView_FromBuffer@Base @VER@ + PyMemoryView_FromObject@Base @VER@ + PyMemoryView_GetContiguous@Base @VER@ + PyMemoryView_Type@Base @VER@ + PyMethod_Class@Base @VER@ + PyMethod_ClearFreeList@Base @VER@ + PyMethod_Fini@Base @VER@ + PyMethod_Function@Base @VER@ + PyMethod_New@Base @VER@ + PyMethod_Self@Base @VER@ + PyMethod_Type@Base @VER@ + PyModule_AddIntConstant@Base @VER@ + PyModule_AddObject@Base @VER@ + PyModule_AddStringConstant@Base @VER@ + PyModule_GetDict@Base @VER@ + PyModule_GetFilename@Base @VER@ + PyModule_GetName@Base @VER@ + PyModule_GetWarningsModule@Base @VER@ + PyModule_New@Base @VER@ + PyModule_Type@Base @VER@ + PyNode_AddChild@Base @VER@ + PyNode_Compile@Base @VER@ + PyNode_Free@Base @VER@ + PyNode_ListTree@Base @VER@ + PyNode_New@Base @VER@ + PyNullImporter_Type@Base @VER@ + PyNumber_Absolute@Base @VER@ + PyNumber_Add@Base @VER@ + PyNumber_And@Base @VER@ + (optional)PyNumber_AsOff_t@Base @VER@ + PyNumber_AsSsize_t@Base @VER@ + PyNumber_Check@Base @VER@ + PyNumber_Coerce@Base @VER@ + PyNumber_CoerceEx@Base @VER@ + PyNumber_Divide@Base @VER@ + PyNumber_Divmod@Base @VER@ + PyNumber_Float@Base @VER@ + PyNumber_FloorDivide@Base @VER@ + PyNumber_InPlaceAdd@Base @VER@ + PyNumber_InPlaceAnd@Base @VER@ + PyNumber_InPlaceDivide@Base @VER@ + PyNumber_InPlaceFloorDivide@Base @VER@ + PyNumber_InPlaceLshift@Base @VER@ + PyNumber_InPlaceMultiply@Base @VER@ + PyNumber_InPlaceOr@Base @VER@ + PyNumber_InPlacePower@Base @VER@ + PyNumber_InPlaceRemainder@Base @VER@ + PyNumber_InPlaceRshift@Base @VER@ + PyNumber_InPlaceSubtract@Base @VER@ + PyNumber_InPlaceTrueDivide@Base @VER@ + PyNumber_InPlaceXor@Base @VER@ + PyNumber_Index@Base @VER@ + PyNumber_Int@Base @VER@ + PyNumber_Invert@Base @VER@ + PyNumber_Long@Base @VER@ + PyNumber_Lshift@Base @VER@ + PyNumber_Multiply@Base @VER@ + PyNumber_Negative@Base @VER@ + PyNumber_Or@Base @VER@ + PyNumber_Positive@Base @VER@ + PyNumber_Power@Base @VER@ + PyNumber_Remainder@Base @VER@ + PyNumber_Rshift@Base @VER@ + PyNumber_Subtract@Base @VER@ + PyNumber_ToBase@Base @VER@ + PyNumber_TrueDivide@Base @VER@ + PyNumber_Xor@Base @VER@ + PyOS_AfterFork@Base @VER@ + PyOS_FiniInterrupts@Base @VER@ + PyOS_InitInterrupts@Base @VER@ + PyOS_InputHook@Base @VER@ + PyOS_InterruptOccurred@Base @VER@ + PyOS_Readline@Base @VER@ + PyOS_ReadlineFunctionPointer@Base @VER@ + PyOS_StdioReadline@Base @VER@ + PyOS_ascii_atof@Base @VER@ + PyOS_ascii_formatd@Base @VER@ + PyOS_ascii_strtod@Base @VER@ + PyOS_double_to_string@Base @VER@ + PyOS_getsig@Base @VER@ + PyOS_mystricmp@Base @VER@ + PyOS_mystrnicmp@Base @VER@ + PyOS_setsig@Base @VER@ + PyOS_snprintf@Base @VER@ + PyOS_string_to_double@Base @VER@ + PyOS_strtol@Base @VER@ + PyOS_strtoul@Base @VER@ + PyOS_vsnprintf@Base @VER@ + PyObject_AsCharBuffer@Base @VER@ + PyObject_AsFileDescriptor@Base @VER@ + PyObject_AsReadBuffer@Base @VER@ + PyObject_AsWriteBuffer@Base @VER@ + PyObject_Call@Base @VER@ + PyObject_CallFunction@Base @VER@ + PyObject_CallFunctionObjArgs@Base @VER@ + PyObject_CallMethod@Base @VER@ + PyObject_CallMethodObjArgs@Base @VER@ + PyObject_CallObject@Base @VER@ + PyObject_CheckReadBuffer@Base @VER@ + PyObject_ClearWeakRefs@Base @VER@ + PyObject_Cmp@Base @VER@ + PyObject_Compare@Base @VER@ + PyObject_CopyData@Base @VER@ + PyObject_DelItem@Base @VER@ + PyObject_DelItemString@Base @VER@ + PyObject_Dir@Base @VER@ + PyObject_Format@Base @VER@ + PyObject_Free@Base @VER@ + PyObject_GC_Del@Base @VER@ + PyObject_GC_Track@Base @VER@ + PyObject_GC_UnTrack@Base @VER@ + PyObject_GenericGetAttr@Base @VER@ + PyObject_GenericSetAttr@Base @VER@ + PyObject_GetAttr@Base @VER@ + PyObject_GetAttrString@Base @VER@ + PyObject_GetBuffer@Base @VER@ + PyObject_GetItem@Base @VER@ + PyObject_GetIter@Base @VER@ + PyObject_HasAttr@Base @VER@ + PyObject_HasAttrString@Base @VER@ + PyObject_Hash@Base @VER@ + PyObject_HashNotImplemented@Base @VER@ + PyObject_Init@Base @VER@ + PyObject_InitVar@Base @VER@ + PyObject_IsInstance@Base @VER@ + PyObject_IsSubclass@Base @VER@ + PyObject_IsTrue@Base @VER@ + PyObject_Length@Base @VER@ + PyObject_Malloc@Base @VER@ + PyObject_Not@Base @VER@ + PyObject_Print@Base @VER@ + PyObject_Realloc@Base @VER@ + PyObject_Repr@Base @VER@ + PyObject_RichCompare@Base @VER@ + PyObject_RichCompareBool@Base @VER@ + PyObject_SelfIter@Base @VER@ + PyObject_SetAttr@Base @VER@ + PyObject_SetAttrString@Base @VER@ + PyObject_SetItem@Base @VER@ + PyObject_Size@Base @VER@ + PyObject_Str@Base @VER@ + PyObject_Type@Base @VER@ + PyObject_Unicode@Base @VER@ + PyParser_ASTFromFile@Base @VER@ + PyParser_ASTFromString@Base @VER@ + PyParser_AddToken@Base @VER@ + PyParser_Delete@Base @VER@ + PyParser_New@Base @VER@ + PyParser_ParseFile@Base @VER@ + PyParser_ParseFileFlags@Base @VER@ + PyParser_ParseFileFlagsEx@Base @VER@ + PyParser_ParseString@Base @VER@ + PyParser_ParseStringFlags@Base @VER@ + PyParser_ParseStringFlagsFilename@Base @VER@ + PyParser_ParseStringFlagsFilenameEx@Base @VER@ + PyParser_SetError@Base @VER@ + PyParser_SimpleParseFile@Base @VER@ + PyParser_SimpleParseFileFlags@Base @VER@ + PyParser_SimpleParseString@Base @VER@ + PyParser_SimpleParseStringFilename@Base @VER@ + PyParser_SimpleParseStringFlags@Base @VER@ + PyParser_SimpleParseStringFlagsFilename@Base @VER@ + PyProperty_Type@Base @VER@ + PyRange_Type@Base @VER@ + (optional)PyRawIOBase_Type@Base @VER@ + PyReversed_Type@Base @VER@ + PyRun_AnyFile@Base @VER@ + PyRun_AnyFileEx@Base @VER@ + PyRun_AnyFileExFlags@Base @VER@ + PyRun_AnyFileFlags@Base @VER@ + PyRun_File@Base @VER@ + PyRun_FileEx@Base @VER@ + PyRun_FileExFlags@Base @VER@ + PyRun_FileFlags@Base @VER@ + PyRun_InteractiveLoop@Base @VER@ + PyRun_InteractiveLoopFlags@Base @VER@ + PyRun_InteractiveOne@Base @VER@ + PyRun_InteractiveOneFlags@Base @VER@ + PyRun_SimpleFile@Base @VER@ + PyRun_SimpleFileEx@Base @VER@ + PyRun_SimpleFileExFlags@Base @VER@ + PyRun_SimpleString@Base @VER@ + PyRun_SimpleStringFlags@Base @VER@ + PyRun_String@Base @VER@ + PyRun_StringFlags@Base @VER@ + PySTEntry_Type@Base @VER@ + PyST_GetScope@Base @VER@ + PySeqIter_New@Base @VER@ + PySeqIter_Type@Base @VER@ + PySequence_Check@Base @VER@ + PySequence_Concat@Base @VER@ + PySequence_Contains@Base @VER@ + PySequence_Count@Base @VER@ + PySequence_DelItem@Base @VER@ + PySequence_DelSlice@Base @VER@ + PySequence_Fast@Base @VER@ + PySequence_GetItem@Base @VER@ + PySequence_GetSlice@Base @VER@ + PySequence_In@Base @VER@ + PySequence_InPlaceConcat@Base @VER@ + PySequence_InPlaceRepeat@Base @VER@ + PySequence_Index@Base @VER@ + PySequence_Length@Base @VER@ + PySequence_List@Base @VER@ + PySequence_Repeat@Base @VER@ + PySequence_SetItem@Base @VER@ + PySequence_SetSlice@Base @VER@ + PySequence_Size@Base @VER@ + PySequence_Tuple@Base @VER@ + PySet_Add@Base @VER@ + PySet_Clear@Base @VER@ + PySet_Contains@Base @VER@ + PySet_Discard@Base @VER@ + PySet_Fini@Base @VER@ + PySet_New@Base @VER@ + PySet_Pop@Base @VER@ + PySet_Size@Base @VER@ + PySet_Type@Base @VER@ + PySignal_SetWakeupFd@Base @VER@ + PySlice_GetIndices@Base @VER@ + PySlice_GetIndicesEx@Base @VER@ + PySlice_New@Base @VER@ + PySlice_Type@Base @VER@ + PyStaticMethod_New@Base @VER@ + PyStaticMethod_Type@Base @VER@ + (optional)PyStringIO_Type@Base @VER@ + PyString_AsDecodedObject@Base @VER@ + PyString_AsDecodedString@Base @VER@ + PyString_AsEncodedObject@Base @VER@ + PyString_AsEncodedString@Base @VER@ + PyString_AsString@Base @VER@ + PyString_AsStringAndSize@Base @VER@ + PyString_Concat@Base @VER@ + PyString_ConcatAndDel@Base @VER@ + PyString_Decode@Base @VER@ + PyString_DecodeEscape@Base @VER@ + PyString_Encode@Base @VER@ + PyString_Fini@Base @VER@ + PyString_Format@Base @VER@ + PyString_FromFormat@Base @VER@ + PyString_FromFormatV@Base @VER@ + PyString_FromString@Base @VER@ + PyString_FromStringAndSize@Base @VER@ + PyString_InternFromString@Base @VER@ + PyString_InternImmortal@Base @VER@ + PyString_InternInPlace@Base @VER@ + PyString_Repr@Base @VER@ + PyString_Size@Base @VER@ + PyString_Type@Base @VER@ + PyStructSequence_InitType@Base @VER@ + PyStructSequence_New@Base @VER@ + PyStructSequence_UnnamedField@Base @VER@ + PySuper_Type@Base @VER@ + PySymtable_Build@Base @VER@ + PySymtable_Free@Base @VER@ + PySymtable_Lookup@Base @VER@ + PySys_AddWarnOption@Base @VER@ + PySys_GetFile@Base @VER@ + PySys_GetObject@Base @VER@ + PySys_HasWarnOptions@Base @VER@ + PySys_ResetWarnOptions@Base @VER@ + PySys_SetArgv@Base @VER@ + PySys_SetArgvEx@Base @VER@ + PySys_SetObject@Base @VER@ + PySys_SetPath@Base @VER@ + PySys_WriteStderr@Base @VER@ + PySys_WriteStdout@Base @VER@ + (optional)PyTextIOBase_Type@Base @VER@ + (optional)PyTextIOWrapper_Type@Base @VER@ + PyThreadState_Clear@Base @VER@ + PyThreadState_Delete@Base @VER@ + PyThreadState_DeleteCurrent@Base @VER@ + PyThreadState_Get@Base @VER@ + PyThreadState_GetDict@Base @VER@ + PyThreadState_New@Base @VER@ + PyThreadState_Next@Base @VER@ + PyThreadState_SetAsyncExc@Base @VER@ + PyThreadState_Swap@Base @VER@ + PyThread_ReInitTLS@Base @VER@ + PyThread_acquire_lock@Base @VER@ + PyThread_allocate_lock@Base @VER@ + PyThread_create_key@Base @VER@ + PyThread_delete_key@Base @VER@ + PyThread_delete_key_value@Base @VER@ + PyThread_exit_thread@Base @VER@ + PyThread_free_lock@Base @VER@ + PyThread_get_key_value@Base @VER@ + PyThread_get_stacksize@Base @VER@ + PyThread_get_thread_ident@Base @VER@ + PyThread_init_thread@Base @VER@ + PyThread_release_lock@Base @VER@ + PyThread_set_key_value@Base @VER@ + PyThread_set_stacksize@Base @VER@ + PyThread_start_new_thread@Base @VER@ + PyToken_OneChar@Base @VER@ + PyToken_ThreeChars@Base @VER@ + PyToken_TwoChars@Base @VER@ + PyTokenizer_Free@Base @VER@ + PyTokenizer_FromFile@Base @VER@ + PyTokenizer_FromString@Base @VER@ + PyTokenizer_Get@Base @VER@ + PyTokenizer_RestoreEncoding@Base @VER@ + PyTraceBack_Here@Base @VER@ + PyTraceBack_Print@Base @VER@ + PyTraceBack_Type@Base @VER@ + PyTupleIter_Type@Base @VER@ + PyTuple_ClearFreeList@Base @VER@ + PyTuple_Fini@Base @VER@ + PyTuple_GetItem@Base @VER@ + PyTuple_GetSlice@Base @VER@ + PyTuple_New@Base @VER@ + PyTuple_Pack@Base @VER@ + PyTuple_SetItem@Base @VER@ + PyTuple_Size@Base @VER@ + PyTuple_Type@Base @VER@ + PyType_ClearCache@Base @VER@ + PyType_GenericAlloc@Base @VER@ + PyType_GenericNew@Base @VER@ + PyType_IsSubtype@Base @VER@ + PyType_Modified@Base @VER@ + PyType_Ready@Base @VER@ + PyType_Type@Base @VER@ + PyUnicodeDecodeError_Create@Base @VER@ + PyUnicodeDecodeError_GetEncoding@Base @VER@ + PyUnicodeDecodeError_GetEnd@Base @VER@ + PyUnicodeDecodeError_GetObject@Base @VER@ + PyUnicodeDecodeError_GetReason@Base @VER@ + PyUnicodeDecodeError_GetStart@Base @VER@ + PyUnicodeDecodeError_SetEnd@Base @VER@ + PyUnicodeDecodeError_SetReason@Base @VER@ + PyUnicodeDecodeError_SetStart@Base @VER@ + PyUnicodeEncodeError_Create@Base @VER@ + PyUnicodeEncodeError_GetEncoding@Base @VER@ + PyUnicodeEncodeError_GetEnd@Base @VER@ + PyUnicodeEncodeError_GetObject@Base @VER@ + PyUnicodeEncodeError_GetReason@Base @VER@ + PyUnicodeEncodeError_GetStart@Base @VER@ + PyUnicodeEncodeError_SetEnd@Base @VER@ + PyUnicodeEncodeError_SetReason@Base @VER@ + PyUnicodeEncodeError_SetStart@Base @VER@ + PyUnicodeTranslateError_Create@Base @VER@ + PyUnicodeTranslateError_GetEnd@Base @VER@ + PyUnicodeTranslateError_GetObject@Base @VER@ + PyUnicodeTranslateError_GetReason@Base @VER@ + PyUnicodeTranslateError_GetStart@Base @VER@ + PyUnicodeTranslateError_SetEnd@Base @VER@ + PyUnicodeTranslateError_SetReason@Base @VER@ + PyUnicodeTranslateError_SetStart@Base @VER@ + PyUnicodeUCS4_AsASCIIString@Base @VER@ + PyUnicodeUCS4_AsCharmapString@Base @VER@ + PyUnicodeUCS4_AsEncodedObject@Base @VER@ + PyUnicodeUCS4_AsEncodedString@Base @VER@ + PyUnicodeUCS4_AsLatin1String@Base @VER@ + PyUnicodeUCS4_AsRawUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsUTF16String@Base @VER@ + PyUnicodeUCS4_AsUTF32String@Base @VER@ + PyUnicodeUCS4_AsUTF8String@Base @VER@ + PyUnicodeUCS4_AsUnicode@Base @VER@ + PyUnicodeUCS4_AsUnicodeEscapeString@Base @VER@ + PyUnicodeUCS4_AsWideChar@Base @VER@ + PyUnicodeUCS4_ClearFreelist@Base @VER@ + PyUnicodeUCS4_Compare@Base @VER@ + PyUnicodeUCS4_Concat@Base @VER@ + PyUnicodeUCS4_Contains@Base @VER@ + PyUnicodeUCS4_Count@Base @VER@ + PyUnicodeUCS4_Decode@Base @VER@ + PyUnicodeUCS4_DecodeASCII@Base @VER@ + PyUnicodeUCS4_DecodeCharmap@Base @VER@ + PyUnicodeUCS4_DecodeLatin1@Base @VER@ + PyUnicodeUCS4_DecodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_DecodeUTF16@Base @VER@ + PyUnicodeUCS4_DecodeUTF16Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF32@Base @VER@ + PyUnicodeUCS4_DecodeUTF32Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUTF8@Base @VER@ + PyUnicodeUCS4_DecodeUTF8Stateful@Base @VER@ + PyUnicodeUCS4_DecodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Encode@Base @VER@ + PyUnicodeUCS4_EncodeASCII@Base @VER@ + PyUnicodeUCS4_EncodeCharmap@Base @VER@ + PyUnicodeUCS4_EncodeDecimal@Base @VER@ + PyUnicodeUCS4_EncodeLatin1@Base @VER@ + PyUnicodeUCS4_EncodeRawUnicodeEscape@Base @VER@ + PyUnicodeUCS4_EncodeUTF16@Base @VER@ + PyUnicodeUCS4_EncodeUTF32@Base @VER@ + PyUnicodeUCS4_EncodeUTF8@Base @VER@ + PyUnicodeUCS4_EncodeUnicodeEscape@Base @VER@ + PyUnicodeUCS4_Find@Base @VER@ + PyUnicodeUCS4_Format@Base @VER@ + PyUnicodeUCS4_FromEncodedObject@Base @VER@ + PyUnicodeUCS4_FromFormat@Base @VER@ + PyUnicodeUCS4_FromFormatV@Base @VER@ + PyUnicodeUCS4_FromObject@Base @VER@ + PyUnicodeUCS4_FromOrdinal@Base @VER@ + PyUnicodeUCS4_FromString@Base @VER@ + PyUnicodeUCS4_FromStringAndSize@Base @VER@ + PyUnicodeUCS4_FromUnicode@Base @VER@ + PyUnicodeUCS4_FromWideChar@Base @VER@ + PyUnicodeUCS4_GetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_GetMax@Base @VER@ + PyUnicodeUCS4_GetSize@Base @VER@ + PyUnicodeUCS4_Join@Base @VER@ + PyUnicodeUCS4_Partition@Base @VER@ + PyUnicodeUCS4_RPartition@Base @VER@ + PyUnicodeUCS4_RSplit@Base @VER@ + PyUnicodeUCS4_Replace@Base @VER@ + PyUnicodeUCS4_Resize@Base @VER@ + PyUnicodeUCS4_RichCompare@Base @VER@ + PyUnicodeUCS4_SetDefaultEncoding@Base @VER@ + PyUnicodeUCS4_Split@Base @VER@ + PyUnicodeUCS4_Splitlines@Base @VER@ + PyUnicodeUCS4_Tailmatch@Base @VER@ + PyUnicodeUCS4_Translate@Base @VER@ + PyUnicodeUCS4_TranslateCharmap@Base @VER@ + PyUnicode_AsDecodedObject@Base @VER@ + PyUnicode_BuildEncodingMap@Base @VER@ + PyUnicode_DecodeUTF7@Base @VER@ + PyUnicode_DecodeUTF7Stateful@Base @VER@ + PyUnicode_EncodeUTF7@Base @VER@ + PyUnicode_Type@Base @VER@ + PyWeakref_GetObject@Base @VER@ + PyWeakref_NewProxy@Base @VER@ + PyWeakref_NewRef@Base @VER@ + PyWrapperDescr_Type@Base @VER@ + PyWrapper_New@Base @VER@ + Py_AddPendingCall@Base @VER@ + Py_AtExit@Base @VER@ + Py_BuildValue@Base @VER@ + Py_BytesWarningFlag@Base @VER@ + Py_CompileString@Base @VER@ + Py_CompileStringFlags@Base @VER@ + Py_DebugFlag@Base @VER@ + Py_DecRef@Base @VER@ + Py_DivisionWarningFlag@Base @VER@ + Py_DontWriteBytecodeFlag@Base @VER@ + Py_EndInterpreter@Base @VER@ + Py_Exit@Base @VER@ + Py_FatalError@Base @VER@ + Py_FdIsInteractive@Base @VER@ + Py_FileSystemDefaultEncoding@Base @VER@ + Py_Finalize@Base @VER@ + Py_FindMethod@Base @VER@ + Py_FindMethodInChain@Base @VER@ + Py_FlushLine@Base @VER@ + Py_FrozenFlag@Base @VER@ + Py_FrozenMain@Base @VER@ + Py_GetArgcArgv@Base @VER@ + Py_GetBuildInfo@Base @VER@ + Py_GetCompiler@Base @VER@ + Py_GetCopyright@Base @VER@ + Py_GetExecPrefix@Base @VER@ + Py_GetPath@Base @VER@ + Py_GetPlatform@Base @VER@ + Py_GetPrefix@Base @VER@ + Py_GetProgramFullPath@Base @VER@ + Py_GetProgramName@Base @VER@ + Py_GetPythonHome@Base @VER@ + Py_GetRecursionLimit@Base @VER@ + Py_GetVersion@Base @VER@ + Py_HashRandomizationFlag@Base @VER@ + Py_IgnoreEnvironmentFlag@Base @VER@ + Py_IncRef@Base @VER@ + Py_Initialize@Base @VER@ + Py_InitializeEx@Base @VER@ + Py_InspectFlag@Base @VER@ + Py_InteractiveFlag@Base @VER@ + Py_IsInitialized@Base @VER@ + Py_Main@Base @VER@ + Py_MakePendingCalls@Base @VER@ + Py_NewInterpreter@Base @VER@ + Py_NoSiteFlag@Base @VER@ + Py_NoUserSiteDirectory@Base @VER@ + Py_OptimizeFlag@Base @VER@ + Py_Py3kWarningFlag@Base @VER@ + Py_ReprEnter@Base @VER@ + Py_ReprLeave@Base @VER@ + Py_SetProgramName@Base @VER@ + Py_SetPythonHome@Base @VER@ + Py_SetRecursionLimit@Base @VER@ + Py_SubversionRevision@Base @VER@ + Py_SubversionShortBranch@Base @VER@ + Py_SymtableString@Base @VER@ + Py_TabcheckFlag@Base @VER@ + Py_UnicodeFlag@Base @VER@ + Py_UniversalNewlineFgets@Base @VER@ + Py_UniversalNewlineFread@Base @VER@ + Py_UseClassExceptionsFlag@Base @VER@ + Py_VaBuildValue@Base @VER@ + Py_VerboseFlag@Base @VER@ + Py_meta_grammar@Base @VER@ + Py_pgen@Base @VER@ + _PyArg_NoKeywords@Base @VER@ + _PyArg_ParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_ParseTuple_SizeT@Base @VER@ + _PyArg_Parse_SizeT@Base @VER@ + _PyArg_VaParseTupleAndKeywords_SizeT@Base @VER@ + _PyArg_VaParse_SizeT@Base @VER@ + _PyBuiltin_Init@Base @VER@ + _PyByteArray_empty_string@Base @VER@ + _PyBytes_FormatAdvanced@Base @VER@ + _PyCode_CheckLineNumber@Base @VER@ + _PyCode_ConstantKey@Base 2.7.11 + _PyCodecInfo_GetIncrementalDecoder@Base @VER@ + _PyCodecInfo_GetIncrementalEncoder@Base @VER@ + _PyCodec_DecodeText@Base @VER@ + _PyCodec_EncodeText@Base @VER@ + _PyCodec_Lookup@Base @VER@ + _PyCodec_LookupTextEncoding@Base @VER@ + _PyComplex_FormatAdvanced@Base @VER@ + _PyDict_Contains@Base @VER@ + _PyDict_GetItemWithError@Base 2.7.11 + _PyDict_MaybeUntrack@Base @VER@ + _PyDict_NewPresized@Base @VER@ + _PyDict_Next@Base @VER@ + _PyErr_BadInternalCall@Base @VER@ + _PyErr_ReplaceException@Base @VER@ + _PyEval_CallTracing@Base @VER@ + _PyEval_SliceIndex@Base @VER@ + _PyExc_Fini@Base @VER@ + _PyExc_Init@Base @VER@ + (optional)_PyFileIO_closed@Base @VER@ + _PyFile_SanitizeMode@Base @VER@ + _PyFloat_FormatAdvanced@Base @VER@ + _PyFloat_Init@Base @VER@ + _PyFloat_Pack4@Base @VER@ + _PyFloat_Pack8@Base @VER@ + _PyFloat_Unpack4@Base @VER@ + _PyFloat_Unpack8@Base @VER@ + _PyFrame_Init@Base @VER@ + _PyGC_Dump@Base @VER@ + _PyGC_generation0@Base @VER@ + _PyGILState_Fini@Base @VER@ + _PyGILState_Init@Base @VER@ + (optional)_PyIOBase_check_closed@Base @VER@ + (optional)_PyIOBase_check_readable@Base @VER@ + (optional)_PyIOBase_check_seekable@Base @VER@ + (optional)_PyIOBase_check_writable@Base @VER@ + (optional)_PyIOBase_finalize@Base @VER@ + (optional)_PyIO_ConvertSsize_t@Base @VER@ + (optional)_PyIO_empty_bytes@Base @VER@ + (optional)_PyIO_empty_str@Base @VER@ + (optional)_PyIO_find_line_ending@Base @VER@ + (optional)_PyIO_locale_module@Base @VER@ + (optional)_PyIO_os_module@Base @VER@ + (optional)_PyIO_str_close@Base @VER@ + (optional)_PyIO_str_closed@Base @VER@ + (optional)_PyIO_str_decode@Base @VER@ + (optional)_PyIO_str_encode@Base @VER@ + (optional)_PyIO_str_fileno@Base @VER@ + (optional)_PyIO_str_flush@Base @VER@ + (optional)_PyIO_str_getstate@Base @VER@ + (optional)_PyIO_str_isatty@Base @VER@ + (optional)_PyIO_str_newlines@Base @VER@ + (optional)_PyIO_str_nl@Base @VER@ + (optional)_PyIO_str_read1@Base @VER@ + (optional)_PyIO_str_read@Base @VER@ + (optional)_PyIO_str_readable@Base @VER@ + (optional)_PyIO_str_readinto@Base @VER@ + (optional)_PyIO_str_readline@Base @VER@ + (optional)_PyIO_str_reset@Base @VER@ + (optional)_PyIO_str_seek@Base @VER@ + (optional)_PyIO_str_seekable@Base @VER@ + (optional)_PyIO_str_setstate@Base @VER@ + (optional)_PyIO_str_tell@Base @VER@ + (optional)_PyIO_str_truncate@Base @VER@ + (optional)_PyIO_str_writable@Base @VER@ + (optional)_PyIO_str_write@Base @VER@ + (optional)_PyIO_trap_eintr@Base @VER@ + (optional)_PyIO_unsupported_operation@Base @VER@ + (optional)_PyIO_zero@Base @VER@ + _PyImportHooks_Init@Base @VER@ + _PyImport_AcquireLock@Base @VER@ + _PyImport_DynLoadFiletab@Base @VER@ + _PyImport_Filetab@Base @VER@ + _PyImport_FindExtension@Base @VER@ + _PyImport_FindModule@Base @VER@ + _PyImport_Fini@Base @VER@ + _PyImport_FixupExtension@Base @VER@ + _PyImport_GetDynLoadFunc@Base @VER@ + _PyImport_Init@Base @VER@ + _PyImport_Inittab@Base @VER@ + _PyImport_IsScript@Base @VER@ + _PyImport_LoadDynamicModule@Base @VER@ + _PyImport_ReleaseLock@Base @VER@ + _PyImport_ReInitLock@Base @VER@ + (optional)_PyIncrementalNewlineDecoder_decode@Base @VER@ + _PyInstance_Lookup@Base @VER@ + _PyInt_AsInt@Base @VER@ + _PyInt_Format@Base @VER@ + _PyInt_FormatAdvanced@Base @VER@ + _PyInt_FromGid@Base @VER@ + _PyInt_FromUid@Base @VER@ + _PyInt_Init@Base @VER@ + _PyList_Extend@Base @VER@ + _PyLong_AsByteArray@Base @VER@ + _PyLong_AsInt@Base @VER@ + _PyLong_Copy@Base @VER@ + _PyLong_DigitValue@Base @VER@ + _PyLong_Format@Base @VER@ + _PyLong_FormatAdvanced@Base @VER@ + _PyLong_Frexp@Base @VER@ + _PyLong_FromByteArray@Base @VER@ + _PyLong_Init@Base @VER@ + _PyLong_New@Base @VER@ + _PyLong_NumBits@Base @VER@ + _PyLong_Sign@Base @VER@ + _PyModule_Clear@Base @VER@ + _PyNode_SizeOf@Base @VER@ + _PyNumber_ConvertIntegralToInt@Base @VER@ + _PyOS_GetOpt@Base @VER@ + _PyOS_ReadlineTState@Base @VER@ + _PyOS_ResetGetOpt@Base @VER@ + _PyOS_URandom@Base @VER@ + _PyOS_ascii_formatd@Base @VER@ + _PyOS_ascii_strtod@Base @VER@ + _PyOS_mystrnicmp_hack@Base @VER@ + _PyOS_optarg@Base @VER@ + _PyOS_opterr@Base @VER@ + _PyOS_optind@Base @VER@ + _PyObject_CallFunction_SizeT@Base @VER@ + _PyObject_CallMethod_SizeT@Base @VER@ + _PyObject_Del@Base @VER@ + _PyObject_Dump@Base @VER@ + _PyObject_GC_Del@Base @VER@ + _PyObject_GC_Malloc@Base @VER@ + _PyObject_GC_New@Base @VER@ + _PyObject_GC_NewVar@Base @VER@ + _PyObject_GC_Resize@Base @VER@ + _PyObject_GC_Track@Base @VER@ + _PyObject_GC_UnTrack@Base @VER@ + _PyObject_GenericGetAttrWithDict@Base @VER@ + _PyObject_GenericSetAttrWithDict@Base @VER@ + _PyObject_GetDictPtr@Base @VER@ + _PyObject_LengthHint@Base @VER@ + _PyObject_LookupSpecial@Base @VER@ + _PyObject_New@Base @VER@ + _PyObject_NewVar@Base @VER@ + _PyObject_NextNotImplemented@Base @VER@ + _PyObject_RealIsInstance@Base @VER@ + _PyObject_RealIsSubclass@Base @VER@ + _PyObject_SlotCompare@Base @VER@ + _PyObject_Str@Base @VER@ + _PyParser_Grammar@Base @VER@ + _PyParser_TokenNames@Base @VER@ + _PyRandom_Fini@Base @VER@ + _PyRandom_Init@Base @VER@ + _PySequence_IterSearch@Base @VER@ + _PySet_Next@Base @VER@ + _PySet_NextEntry@Base @VER@ + _PySet_Update@Base @VER@ + _PySlice_FromIndices@Base @VER@ + _PyString_Eq@Base @VER@ + _PyString_FormatLong@Base @VER@ + _PyString_InsertThousandsGrouping@Base @VER@ + _PyString_Join@Base @VER@ + _PyString_Resize@Base @VER@ + _PySys_GetSizeOf@Base @VER@ + _PySys_Init@Base @VER@ + _PyThreadState_Current@Base @VER@ + _PyThreadState_GetFrame@Base @VER@ + _PyThreadState_Init@Base @VER@ + _PyThreadState_Prealloc@Base @VER@ + _PyThread_CurrentFrames@Base @VER@ + _PyTime_DoubleToTimet@Base @VER@ + _PyTime_FloatTime@Base @VER@ + _PyTrash_delete_later@Base @VER@ + _PyTrash_delete_nesting@Base @VER@ + _PyTrash_deposit_object@Base @VER@ + _PyTrash_destroy_chain@Base @VER@ + _PyTrash_thread_deposit_object@Base @VER@ + _PyTrash_thread_destroy_chain@Base @VER@ + _PyTuple_MaybeUntrack@Base @VER@ + _PyTuple_Resize@Base @VER@ + _PyType_Lookup@Base @VER@ + _PyUnicodeUCS4_AsDefaultEncodedString@Base @VER@ + _PyUnicodeUCS4_Fini@Base @VER@ + _PyUnicodeUCS4_Init@Base @VER@ + _PyUnicodeUCS4_IsAlpha@Base @VER@ + _PyUnicodeUCS4_IsDecimalDigit@Base @VER@ + _PyUnicodeUCS4_IsDigit@Base @VER@ + _PyUnicodeUCS4_IsLinebreak@Base @VER@ + _PyUnicodeUCS4_IsLowercase@Base @VER@ + _PyUnicodeUCS4_IsNumeric@Base @VER@ + _PyUnicodeUCS4_IsTitlecase@Base @VER@ + _PyUnicodeUCS4_IsUppercase@Base @VER@ + _PyUnicodeUCS4_IsWhitespace@Base @VER@ + _PyUnicodeUCS4_ToDecimalDigit@Base @VER@ + _PyUnicodeUCS4_ToDigit@Base @VER@ + _PyUnicodeUCS4_ToLowercase@Base @VER@ + _PyUnicodeUCS4_ToNumeric@Base @VER@ + _PyUnicodeUCS4_ToTitlecase@Base @VER@ + _PyUnicodeUCS4_ToUppercase@Base @VER@ + _PyUnicode_BidirectionalNames@Base @VER@ + _PyUnicode_CategoryNames@Base @VER@ + _PyUnicode_Database_Records@Base @VER@ + _PyUnicode_DecodeUnicodeInternal@Base @VER@ + _PyUnicode_EastAsianWidthNames@Base @VER@ + _PyUnicode_FormatAdvanced@Base @VER@ + _PyUnicode_TypeRecords@Base @VER@ + _PyUnicode_XStrip@Base @VER@ + _PyWarnings_Init@Base @VER@ + _PyWeakref_CallableProxyType@Base @VER@ + _PyWeakref_ClearRef@Base @VER@ + _PyWeakref_GetWeakrefCount@Base @VER@ + _PyWeakref_ProxyType@Base @VER@ + _PyWeakref_RefType@Base @VER@ + _Py_Assert@Base @VER@ + _Py_Assign@Base @VER@ + _Py_Attribute@Base @VER@ + _Py_AugAssign@Base @VER@ + _Py_BinOp@Base @VER@ + _Py_BoolOp@Base @VER@ + _Py_Break@Base @VER@ + _Py_BuildValue_SizeT@Base @VER@ + _Py_Call@Base @VER@ + _Py_CheckInterval@Base @VER@ + _Py_CheckRecursionLimit@Base @VER@ + _Py_CheckRecursiveCall@Base @VER@ + _Py_ClassDef@Base @VER@ + _Py_Compare@Base @VER@ + _Py_Continue@Base @VER@ + _Py_Delete@Base @VER@ + _Py_Dict@Base @VER@ + _Py_DictComp@Base @VER@ + _Py_DisplaySourceLine@Base @VER@ + _Py_Ellipsis@Base @VER@ + _Py_EllipsisObject@Base @VER@ + _Py_ExceptHandler@Base @VER@ + _Py_Exec@Base @VER@ + _Py_Expr@Base @VER@ + _Py_Expression@Base @VER@ + _Py_ExtSlice@Base @VER@ + _Py_For@Base @VER@ + _Py_FunctionDef@Base @VER@ + _Py_GeneratorExp@Base @VER@ + _Py_Gid_Converter@Base @VER@ + _Py_Global@Base @VER@ + _Py_HashDouble@Base @VER@ + _Py_HashPointer@Base @VER@ + _Py_HashSecret@Base @VER@ + _Py_If@Base @VER@ + _Py_IfExp@Base @VER@ + _Py_Import@Base @VER@ + _Py_ImportFrom@Base @VER@ + _Py_Index@Base @VER@ + _Py_InsertThousandsGroupingLocale@Base @VER@ + _Py_Interactive@Base @VER@ + _Py_Lambda@Base @VER@ + _Py_List@Base @VER@ + _Py_ListComp@Base @VER@ + _Py_Mangle@Base @VER@ + _Py_Module@Base @VER@ + _Py_Name@Base @VER@ + _Py_NoneStruct@Base @VER@ + _Py_NotImplementedStruct@Base @VER@ + _Py_Num@Base @VER@ + _Py_PackageContext@Base @VER@ + _Py_Pass@Base @VER@ + _Py_Print@Base @VER@ + _Py_QnewFlag@Base @VER@ + _Py_Raise@Base @VER@ + _Py_ReadyTypes@Base @VER@ + _Py_ReleaseInternedStrings@Base @VER@ + _Py_Repr@Base @VER@ + _Py_Return@Base @VER@ + _Py_Set@Base @VER@ + _Py_SetComp@Base @VER@ + _Py_Slice@Base @VER@ + _Py_Str@Base @VER@ + _Py_Subscript@Base @VER@ + _Py_Suite@Base @VER@ + _Py_SwappedOp@Base @VER@ + _Py_Ticker@Base @VER@ + _Py_TrueStruct@Base @VER@ + _Py_TryExcept@Base @VER@ + _Py_TryFinally@Base @VER@ + _Py_Tuple@Base @VER@ + _Py_Uid_Converter@Base @VER@ + _Py_UnaryOp@Base @VER@ + _Py_VaBuildValue_SizeT@Base @VER@ + _Py_While@Base @VER@ + _Py_With@Base @VER@ + _Py_Yield@Base @VER@ + _Py_ZeroStruct@Base @VER@ + _Py_abstract_hack@Base @VER@ + _Py_add_one_to_index_C@Base @VER@ + _Py_add_one_to_index_F@Base @VER@ + (optional)_Py_acosh@Base @VER@ + _Py_addarc@Base @VER@ + _Py_addbit@Base @VER@ + _Py_adddfa@Base @VER@ + _Py_addfirstsets@Base @VER@ + _Py_addlabel@Base @VER@ + _Py_addstate@Base @VER@ + _Py_alias@Base @VER@ + _Py_arguments@Base @VER@ + _Py_ascii_whitespace@Base @VER@ + (optional)_Py_asinh@Base @VER@ + (optional)_Py_atanh@Base @VER@ + _Py_bytes_capitalize@Base @VER@ + _Py_bytes_isalnum@Base @VER@ + _Py_bytes_isalpha@Base @VER@ + _Py_bytes_isdigit@Base @VER@ + _Py_bytes_islower@Base @VER@ + _Py_bytes_isspace@Base @VER@ + _Py_bytes_istitle@Base @VER@ + _Py_bytes_isupper@Base @VER@ + _Py_bytes_lower@Base @VER@ + _Py_bytes_swapcase@Base @VER@ + _Py_bytes_title@Base @VER@ + _Py_bytes_upper@Base @VER@ + _Py_c_abs@Base @VER@ + _Py_c_diff@Base @VER@ + _Py_c_neg@Base @VER@ + _Py_c_pow@Base @VER@ + _Py_c_prod@Base @VER@ + _Py_c_quot@Base @VER@ + _Py_c_sum@Base @VER@ + _Py_capitalize__doc__@Base @VER@ + _Py_capsule_hack@Base @VER@ + _Py_cobject_hack@Base @VER@ + _Py_comprehension@Base @VER@ + _Py_ctype_table@Base @VER@ + _Py_ctype_tolower@Base @VER@ + _Py_ctype_toupper@Base @VER@ + _Py_delbitset@Base @VER@ + (arch=!m68k)_Py_dg_dtoa@Base @VER@ + (arch=!m68k)_Py_dg_freedtoa@Base @VER@ + (arch=!m68k)_Py_dg_strtod@Base @VER@ + _Py_double_round@Base @VER@ + (optional)_Py_expm1@Base @VER@ + _Py_findlabel@Base @VER@ + (arch=i386 lpia m68k)_Py_force_double@Base @VER@ + (arch=amd64 i386 lpia)_Py_get_387controlword@Base @VER@ + _Py_hgidentifier@Base 2.7.1 + _Py_hgversion@Base 2.7.1 + _Py_isalnum__doc__@Base @VER@ + _Py_isalpha__doc__@Base @VER@ + _Py_isdigit__doc__@Base @VER@ + _Py_islower__doc__@Base @VER@ + _Py_isspace__doc__@Base @VER@ + _Py_istitle__doc__@Base @VER@ + _Py_isupper__doc__@Base @VER@ + _Py_keyword@Base @VER@ + (optional)_Py_log1p@Base @VER@ + _Py_lower__doc__@Base @VER@ + _Py_mergebitset@Base @VER@ + _Py_meta_grammar@Base @VER@ + _Py_newbitset@Base @VER@ + _Py_newgrammar@Base @VER@ + (optional)_Py_parse_inf_or_nan@Base @VER@ + _Py_pgen@Base @VER@ + _Py_samebitset@Base @VER@ + (arch=amd64 i386 lpia)_Py_set_387controlword@Base @VER@ + _Py_svnversion@Base @VER@ + _Py_swapcase__doc__@Base @VER@ + _Py_title__doc__@Base @VER@ + _Py_translatelabels@Base @VER@ + _Py_upper__doc__@Base @VER@ + + PyFPE_counter@Base @VER@ + PyFPE_dummy@Base @VER@ + PyFPE_jbuf@Base @VER@ + + asdl_int_seq_new@Base @VER@ + asdl_seq_new@Base @VER@ + +# don't check for the following symbols, found in extensions +# which either can be built as builtin or extension. + + (optional)fast_save_leave@Base @VER@ + (optional)partial_reduce@Base @VER@ + (optional)partial_setstate@Base @VER@ + + (optional)md5_append@Base @VER@ + (optional)md5_finish@Base @VER@ + (optional)md5_init@Base @VER@ + +# _check_for_multiple_distdirs@Base @VER@ + (optional)init_ast@Base @VER@ + (optional)init_bisect@Base @VER@ + (optional)init_codecs@Base @VER@ + (optional)init_collections@Base @VER@ + (optional)init_functools@Base @VER@ + (optional)init_hashlib@Base @VER@ + (optional)init_heapq@Base @VER@ + (optional)init_io@Base @VER@ + (optional)init_locale@Base @VER@ + (optional)init_md5@Base @VER@ + (optional)init_random@Base @VER@ + (optional)init_sha@Base @VER@ + (optional)init_sha256@Base @VER@ + (optional)init_sha512@Base @VER@ + (optional)init_socket@Base @VER@ + (optional)init_sockobject@Base @VER@ + (optional)init_sre@Base @VER@ + (optional)init_ssl@Base @VER@ + (optional)init_struct@Base @VER@ + (optional)init_symtable@Base @VER@ + (optional)init_weakref@Base @VER@ + (optional)initarray@Base @VER@ + (optional)initbinascii@Base @VER@ + (optional)initcPickle@Base @VER@ + (optional)initcStringIO@Base @VER@ + (optional)initcmath@Base @VER@ + (optional)initdatetime@Base @VER@ + (optional)initerrno@Base @VER@ + (optional)initfcntl@Base @VER@ + (optional)initgc@Base @VER@ + (optional)initgrp@Base @VER@ + (optional)initimp@Base @VER@ + (optional)inititertools@Base @VER@ + (optional)initmath@Base @VER@ + (optional)initoperator@Base @VER@ + (optional)initposix@Base @VER@ + (optional)initpwd@Base @VER@ + (optional)initselect@Base @VER@ + (optional)initsignal@Base @VER@ + (optional)initspwd@Base @VER@ + (optional)initstrop@Base @VER@ + (optional)initsyslog@Base @VER@ + (optional)initthread@Base @VER@ + (optional)inittime@Base @VER@ + (optional)initunicodedata@Base @VER@ + (optional)initxxsubtype@Base @VER@ + (optional)initzipimport@Base @VER@ + (optional)initzlib@Base @VER@ --- python2.7-2.7.12.orig/debian/locale-gen +++ python2.7-2.7.12/debian/locale-gen @@ -0,0 +1,31 @@ +#!/bin/sh + +LOCPATH=`pwd`/locales +export LOCPATH + +[ -d $LOCPATH ] || mkdir -p $LOCPATH + +umask 022 + +echo "Generating locales..." +while read locale charset; do + case $locale in \#*) continue;; esac + [ -n "$locale" -a -n "$charset" ] || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`" + echo -n ".$charset" + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'` + echo -n '...' + if [ -f $LOCPATH/$locale ]; then + input=$locale + else + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'` + fi + localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias + echo ' done'; \ +done < +# elif defined(__x86_64__) && defined(__ILP32__) +# include +# elif defined(__i386__) +# include +# elif defined(__aarch64__) && defined(__AARCH64EL__) +# if defined(__ILP32__) +# include +# else +# include +# endif +# elif defined(__aarch64__) && defined(__AARCH64EB__) +# if defined(__ILP32__) +# include +# else +# include +# endif +# elif defined(__alpha__) +# include +# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP) +# if defined(__ARMEL__) +# include +# else +# include +# endif +# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) +# if defined(__ARMEL__) +# include +# else +# include +# endif +# elif defined(__hppa__) +# include +# elif defined(__ia64__) +# include +# elif defined(__m68k__) && !defined(__mcoldfire__) +# include +# elif defined(__mips_hard_float) && defined(_MIPSEL) +# if _MIPS_SIM == _ABIO32 +# include +# elif _MIPS_SIM == _ABIN32 +# include +# elif _MIPS_SIM == _ABI64 +# include +# else +# error unknown multiarch location for @header@ +# endif +# elif defined(__mips_hard_float) +# if _MIPS_SIM == _ABIO32 +# include +# elif _MIPS_SIM == _ABIN32 +# include +# elif _MIPS_SIM == _ABI64 +# include +# else +# error unknown multiarch location for @header@ +# endif +# elif defined(__or1k__) +# include +# elif defined(__powerpc__) && defined(__SPE__) +# include +# elif defined(__powerpc64__) +# if defined(__LITTLE_ENDIAN__) +# include +# else +# include +# endif +# elif defined(__powerpc__) +# include +# elif defined(__s390x__) +# include +# elif defined(__s390__) +# include +# elif defined(__sh__) && defined(__LITTLE_ENDIAN__) +# include +# elif defined(__sparc__) && defined(__arch64__) +# include +# elif defined(__sparc__) +# include +# else +# error unknown multiarch location for @header@ +# endif +#elif defined(__FreeBSD_kernel__) +# if defined(__LP64__) +# include +# elif defined(__i386__) +# include +# else +# error unknown multiarch location for @header@ +# endif +#elif defined(__gnu_hurd__) +# include +#else +# error unknown multiarch location for @header@ +#endif --- python2.7-2.7.12.orig/debian/patches/add-python-config-sh.diff +++ python2.7-2.7.12/debian/patches/add-python-config-sh.diff @@ -0,0 +1,182 @@ +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1191,6 +1191,8 @@ python-config: $(srcdir)/Misc/python-con + # Substitution happens here, as the completely-expanded BINDIR + # is not available in configure + sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config ++ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} ++ sed -e "s,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g" < Misc/python-config.sh >python-config.sh + + # Install the include files + INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) +@@ -1250,6 +1252,7 @@ libainstall: all python-config + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config + rm python-config ++ $(INSTALL_SCRIPT) python-config.sh $(DESTDIR)$(BINDIR)/python-config.sh + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ + echo; echo "Installing support files for building shared extension modules on AIX:"; \ +Index: b/Misc/python-config.in +=================================================================== +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -56,3 +56,11 @@ for opt in opt_flags: + libs.extend(getvar('LINKFORSHARED').split()) + print ' '.join(libs) + ++ elif opt == '--extension-suffix': ++ print sysconfig.get_config_var('SO') ++ ++ elif opt == '--abiflags': ++ print '' ++ ++ elif opt == '--configdir': ++ print sysconfig.get_config_var('LIBPL') +Index: b/Misc/python-config.sh.in +=================================================================== +--- /dev/null ++++ b/Misc/python-config.sh.in +@@ -0,0 +1,103 @@ ++#!/bin/sh ++ ++exit_with_usage () ++{ ++ echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir" ++ exit $1 ++} ++ ++if [ "$1" = "" ] ; then ++ exit_with_usage 1 ++fi ++ ++# Returns the actual prefix where this script was installed to. ++installed_prefix () ++{ ++ local RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) ++ if [ $(which readlink) ] ; then ++ RESULT=$(readlink -f "$RESULT") ++ fi ++ echo $RESULT ++} ++ ++prefix_build="@prefix@" ++prefix_real=$(installed_prefix "$0") ++ ++# Use sed to fix paths from their built to locations to their installed to locations. ++prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") ++exec_prefix_build="@exec_prefix@" ++exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") ++includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") ++libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") ++CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") ++VERSION="@VERSION@" ++LIBM="@LIBM@" ++LIBC="@LIBC@" ++SYSLIBS="$LIBM $LIBC" ++ABIFLAGS="@DEBUG_EXT@" ++MULTIARCH="@MULTIARCH@" ++LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" ++BASECFLAGS="@BASECFLAGS@" ++LDLIBRARY="@LDLIBRARY@" ++LINKFORSHARED="@LINKFORSHARED@" ++OPT="@OPT@" ++PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" ++LIBDEST=${prefix}/lib/python${VERSION} ++LIBPL=${LIBDEST}/config-${MULTIARCH}${ABIFLAGS} ++SO="${ABIFLAGS}.so" ++PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" ++INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" ++PLATINCDIR="-I$includedir/$MULTIARCH/python${VERSION}${ABIFLAGS}" ++ ++# Scan for --help or unknown argument. ++for ARG in $* ++do ++ case $ARG in ++ --help) ++ exit_with_usage 0 ++ ;; ++ --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--configdir) ++ ;; ++ *) ++ exit_with_usage 1 ++ ;; ++ esac ++done ++ ++for ARG in $* ++do ++ case $ARG in ++ --prefix) ++ echo "$prefix" ++ ;; ++ --exec-prefix) ++ echo "$exec_prefix" ++ ;; ++ --includes) ++ echo "$INCDIR" "$PLATINCDIR" ++ ;; ++ --cflags) ++ echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" ++ ;; ++ --libs) ++ echo "$LIBS" ++ ;; ++ --ldflags) ++ LINKFORSHAREDUSED= ++ if [ -z "$PYTHONFRAMEWORK" ] ; then ++ LINKFORSHAREDUSED=$LINKFORSHARED ++ fi ++ LIBPLUSED= ++ if [ "$PY_ENABLE_SHARED" = "0" ] ; then ++ LIBPLUSED="-L$LIBPL" ++ fi ++ echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" ++ ;; ++ --extension-suffix) ++ echo "$SO" ++ ;; ++ --configdir) ++ echo "$LIBPL" ++ ;; ++esac ++done +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -898,6 +898,7 @@ fi + + # Other platforms follow + if test $enable_shared = "yes"; then ++ PY_ENABLE_SHARED=1 + AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) + case $ac_sys_system in + BeOS*) +@@ -958,6 +959,7 @@ if test $enable_shared = "yes"; then + + esac + else # shared is disabled ++ PY_ENABLE_SHARED=0 + case $ac_sys_system in + CYGWIN*) + BLDLIBRARY='$(LIBRARY)' +@@ -965,6 +967,7 @@ else # shared is disabled + ;; + esac + fi ++AC_SUBST(PY_ENABLE_SHARED) + + if test "$cross_compiling" = yes; then + RUNSHARED= +@@ -4763,7 +4766,7 @@ AC_MSG_RESULT($ENSUREPIP) + AC_SUBST(ENSUREPIP) + + # generate output files +-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) ++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) + AC_OUTPUT + --- python2.7-2.7.12.orig/debian/patches/atomic-pyc-rename.diff +++ python2.7-2.7.12/debian/patches/atomic-pyc-rename.diff @@ -0,0 +1,34 @@ +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -120,13 +120,24 @@ + return + if cfile is None: + cfile = file + (__debug__ and 'c' or 'o') +- with open(cfile, 'wb') as fc: +- fc.write('\0\0\0\0') +- wr_long(fc, timestamp) +- marshal.dump(codeobject, fc) +- fc.flush() +- fc.seek(0, 0) +- fc.write(MAGIC) ++ # Atomically write the pyc/pyo file. Issue #13146. ++ # id() is used to generate a pseudo-random filename. ++ path_tmp = '{}.{}'.format(cfile, id(cfile)) ++ try: ++ with open(path_tmp, 'wb') as fc: ++ fc.write('\0\0\0\0') ++ wr_long(fc, timestamp) ++ marshal.dump(codeobject, fc) ++ fc.flush() ++ fc.seek(0, 0) ++ fc.write(MAGIC) ++ os.rename(path_tmp, cfile) ++ except OSError: ++ try: ++ os.unlink(path_tmp) ++ except OSError: ++ pass ++ raise + + def main(args=None): + """Compile several source files. --- python2.7-2.7.12.orig/debian/patches/bdist-wininst-notfound.diff +++ python2.7-2.7.12/debian/patches/bdist-wininst-notfound.diff @@ -0,0 +1,25 @@ +# DP: the wininst-* files cannot be built within Debian, needing a +# DP: zlib mingw build, which the zlib maintainer isn't going to provide. + +--- a/Lib/distutils/command/bdist_wininst.py ++++ b/Lib/distutils/command/bdist_wininst.py +@@ -14,6 +14,7 @@ + from distutils.core import Command + from distutils.dir_util import remove_tree + from distutils.errors import DistutilsOptionError, DistutilsPlatformError ++from distutils.errors import DistutilsFileError + from distutils import log + from distutils.util import get_platform + +@@ -360,7 +361,10 @@ + sfix = '' + + filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix)) +- f = open(filename, "rb") ++ try: ++ f = open(filename, "rb") ++ except IOError, msg: ++ raise DistutilsFileError, str(msg) + ', %s not included in the Debian packages.' % filename + try: + return f.read() + finally: --- python2.7-2.7.12.orig/debian/patches/bsddb-libpath.diff +++ python2.7-2.7.12/debian/patches/bsddb-libpath.diff @@ -0,0 +1,21 @@ +# DP: Don't add the bsddb multilib path, if already in the standard lib path + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1090,7 +1090,13 @@ class PyBuildExt(build_ext): + if db_setup_debug: + print "bsddb using BerkeleyDB lib:", db_ver, dblib + print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir +- db_incs = [db_incdir] ++ # only add db_incdir/dblib_dir if not in the standard paths ++ if db_incdir in inc_dirs: ++ db_incs = [] ++ else: ++ db_incs = [db_incdir] ++ if dblib_dir[0] in lib_dirs: ++ dblib_dir = [] + dblibs = [dblib] + # We add the runtime_library_dirs argument because the + # BerkeleyDB lib we're linking against often isn't in the --- python2.7-2.7.12.orig/debian/patches/build-hash.diff +++ python2.7-2.7.12/debian/patches/build-hash.diff @@ -0,0 +1,24 @@ +# DP: Always build the _md5, _sha1, _sha256 and _sha512 extension modules. + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -874,7 +874,7 @@ class PyBuildExt(build_ext): + print ("warning: openssl 0x%08x is too old for _hashlib" % + openssl_ver) + missing.append('_hashlib') +- if COMPILED_WITH_PYDEBUG or not have_usable_openssl: ++ if True or COMPILED_WITH_PYDEBUG or not have_usable_openssl: + # The _sha module implements the SHA1 hash algorithm. + exts.append( Extension('_sha', ['shamodule.c']) ) + # The _md5 module implements the RSA Data Security, Inc. MD5 +@@ -885,7 +885,7 @@ class PyBuildExt(build_ext): + depends = ['md5.h']) ) + + min_sha2_openssl_ver = 0x00908000 +- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: ++ if True or COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver: + # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash + exts.append( Extension('_sha256', ['sha256module.c']) ) + exts.append( Extension('_sha512', ['sha512module.c']) ) --- python2.7-2.7.12.orig/debian/patches/build-libpython.diff +++ python2.7-2.7.12/debian/patches/build-libpython.diff @@ -0,0 +1,24 @@ +# DP: Don't include object files twice in libpython. + +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -429,7 +429,7 @@ LIBRARY_OBJS= \ + $(PYTHON_OBJS) \ + $(MODULE_OBJS) \ + $(SIGNAL_OBJS) \ +- $(MODOBJS) ++ $(sort $(MODOBJS)) + + ######################################################################### + # Rules +@@ -563,7 +563,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) + $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) + $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODOBJS) ++ $(AR) $(ARFLAGS) $@ $(sort $(MODOBJS)) + $(RANLIB) $@ + + libpython$(VERSION).so: $(LIBRARY_OBJS) --- python2.7-2.7.12.orig/debian/patches/cthreads.diff +++ python2.7-2.7.12/debian/patches/cthreads.diff @@ -0,0 +1,39 @@ +# DP: Remove cthreads detection + +--- a/configure.ac ++++ b/configure.ac +@@ -2154,7 +2154,6 @@ + + # Templates for things AC_DEFINEd more than once. + # For a single AC_DEFINE, no template is needed. +-AH_TEMPLATE(C_THREADS,[Define if you have the Mach cthreads package]) + AH_TEMPLATE(_REENTRANT, + [Define to force use of thread-safe errno, h_errno, and other functions]) + AH_TEMPLATE(WITH_THREAD, +@@ -2236,17 +2235,6 @@ + AC_MSG_RESULT($unistd_defines_pthreads) + + AC_DEFINE(_REENTRANT) +- AC_CHECK_HEADER(cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(HURD_C_THREADS, 1, +- [Define if you are using Mach cthreads directly under /include]) +- LIBS="$LIBS -lthreads" +- THREADOBJ="Python/thread.o"],[ +- AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) +- AC_DEFINE(C_THREADS) +- AC_DEFINE(MACH_C_THREADS, 1, +- [Define if you are using Mach cthreads under mach /]) +- THREADOBJ="Python/thread.o"],[ + AC_MSG_CHECKING(for --with-pth) + AC_ARG_WITH([pth], + AS_HELP_STRING([--with-pth], [use GNU pth threading libraries]), +@@ -2301,7 +2289,7 @@ + LIBS="$LIBS -lcma" + THREADOBJ="Python/thread.o"],[ + USE_THREAD_MODULE="#"]) +- ])])])])])])])])])]) ++ ])])])])])])])]) + + AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) + LIBS="$LIBS -lmpc" --- python2.7-2.7.12.orig/debian/patches/ctypes-arm.diff +++ python2.7-2.7.12/debian/patches/ctypes-arm.diff @@ -0,0 +1,34 @@ +Index: b/Lib/ctypes/util.py +=================================================================== +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -208,16 +208,27 @@ elif os.name == "posix": + + def _findSoname_ldconfig(name): + import struct ++ # XXX this code assumes that we know all unames and that a single ++ # ABI is supported per uname; instead we should find what the ++ # ABI is (e.g. check ABI of current process) or simply ask libc ++ # to load the library for us ++ uname = os.uname()[4] ++ # ARM has a variety of unames, e.g. armv7l ++ if uname.startswith("arm"): ++ uname = "arm" + if struct.calcsize('l') == 4: +- machine = os.uname()[4] + '-32' ++ machine = uname + '-32' + else: +- machine = os.uname()[4] + '-64' ++ machine = uname + '-64' + mach_map = { + 'x86_64-64': 'libc6,x86-64', + 'ppc64-64': 'libc6,64bit', + 'sparc64-64': 'libc6,64bit', + 's390x-64': 'libc6,64bit', + 'ia64-64': 'libc6,IA-64', ++ # this actually breaks on biarch or multiarch as the first ++ # library wins; uname doesn't tell us which ABI we're using ++ 'arm-32': 'libc6(,hard-float)?', + } + abi_type = mach_map.get(machine, 'libc6') + --- python2.7-2.7.12.orig/debian/patches/deb-locations.diff +++ python2.7-2.7.12/debian/patches/deb-locations.diff @@ -0,0 +1,73 @@ +# DP: adjust locations of directories to debian policy + +Index: b/Demo/tkinter/guido/ManPage.py +=================================================================== +--- a/Demo/tkinter/guido/ManPage.py ++++ b/Demo/tkinter/guido/ManPage.py +@@ -189,8 +189,9 @@ ManPage = ReadonlyManPage + def test(): + import os + import sys +- # XXX This directory may be different on your system +- MANDIR = '/usr/local/man/mann' ++ # XXX This directory may be different on your system, ++ # it is here set for Debian GNU/Linux. ++ MANDIR = '/usr/share/man' + DEFAULTPAGE = 'Tcl' + formatted = 0 + if sys.argv[1:] and sys.argv[1] == '-f': +Index: b/Demo/tkinter/guido/tkman.py +=================================================================== +--- a/Demo/tkinter/guido/tkman.py ++++ b/Demo/tkinter/guido/tkman.py +@@ -9,8 +9,8 @@ import re + from Tkinter import * + from ManPage import ManPage + +-MANNDIRLIST = ['/depot/sundry/man/mann','/usr/local/man/mann'] +-MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/local/man/man3'] ++MANNDIRLIST = ['/depot/sundry/man/mann','/usr/share/man/mann'] ++MAN3DIRLIST = ['/depot/sundry/man/man3','/usr/share/man/man3'] + + foundmanndir = 0 + for dir in MANNDIRLIST: +Index: b/Misc/python.man +=================================================================== +--- a/Misc/python.man ++++ b/Misc/python.man +@@ -337,7 +337,7 @@ exception). Error messages are written + These are subject to difference depending on local installation + conventions; ${prefix} and ${exec_prefix} are installation-dependent + and should be interpreted as for GNU software; they may be the same. +-The default for both is \fI/usr/local\fP. ++On Debian GNU/{Hurd,Linux} the default for both is \fI/usr\fP. + .IP \fI${exec_prefix}/bin/python\fP + Recommended location of the interpreter. + .PP +Index: b/Tools/faqwiz/faqconf.py +=================================================================== +--- a/Tools/faqwiz/faqconf.py ++++ b/Tools/faqwiz/faqconf.py +@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" + OWNEREMAIL = "nobody@anywhere.org" # Email for feedback + HOMEURL = "http://www.python.org" # Related home page + HOMENAME = "Python home" # Name of related home page +-RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ++RCSBINDIR = "/usr/bin/" # Directory containing RCS commands + # (must end in a slash) + + # Parameters you can normally leave alone +Index: b/Tools/webchecker/webchecker.py +=================================================================== +--- a/Tools/webchecker/webchecker.py ++++ b/Tools/webchecker/webchecker.py +@@ -19,7 +19,8 @@ file index.html in that directory is ret + a directory listing is returned. Now, you can point webchecker to the + document tree in the local file system of your HTTP daemon, and have + most of it checked. In fact the default works this way if your local +-web tree is located at /usr/local/etc/httpd/htdpcs (the default for ++web tree is located at /var/www, which is the default for Debian ++GNU/Linux. Other systems use /usr/local/etc/httpd/htdocs (the default for + the NCSA HTTP daemon and probably others). + + Report printed: --- python2.7-2.7.12.orig/debian/patches/deb-setup.diff +++ python2.7-2.7.12/debian/patches/deb-setup.diff @@ -0,0 +1,21 @@ +# DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -454,10 +454,10 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) + + def detect_modules(self): +- # Ensure that /usr/local is always used +- if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # On Debian /usr/local is always used, so we don't include it twice ++ #if not cross_compiling: ++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() + self.add_multiarch_paths() --- python2.7-2.7.12.orig/debian/patches/debug-build.diff +++ python2.7-2.7.12/debian/patches/debug-build.diff @@ -0,0 +1,248 @@ +# DP: Change the interpreter to build and install python extensions +# DP: built with the python-dbg interpreter with a different name into +# DP: the same path (by appending `_d' to the extension name). + +Index: b/Lib/distutils/command/build.py +=================================================================== +--- a/Lib/distutils/command/build.py ++++ b/Lib/distutils/command/build.py +@@ -91,7 +91,8 @@ class build(Command): + # 'lib.' under the base build directory. We only use one of + # them for a given distribution, though -- + if self.build_purelib is None: +- self.build_purelib = os.path.join(self.build_base, 'lib') ++ self.build_purelib = os.path.join(self.build_base, ++ 'lib' + plat_specifier) + if self.build_platlib is None: + self.build_platlib = os.path.join(self.build_base, + 'lib' + plat_specifier) +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -90,7 +90,7 @@ def get_python_inc(plat_specific=0, pref + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ return os.path.join(prefix, "include", "python" + get_python_version())+(sys.pydebug and "_d" or "") + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "os2": +@@ -263,7 +263,7 @@ def get_makefile_filename(): + if python_build: + return os.path.join(project_base, "Makefile") + lib_dir = get_python_lib(plat_specific=1, standard_lib=1) +- return os.path.join(lib_dir, "config", "Makefile") ++ return os.path.join(lib_dir, "config"+(sys.pydebug and "_d" or ""), "Makefile") + + + def parse_config_h(fp, g=None): +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -333,7 +333,7 @@ def get_makefile_filename(): + """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") +- return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config", "Makefile") ++ return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config" + (sys.pydebug and "_d" or ""), "Makefile") + + # Issue #22199: retain undocumented private name for compatibility + _get_makefile_filename = get_makefile_filename +@@ -465,7 +465,7 @@ def get_config_h_filename(): + else: + inc_dir = _PROJECT_BASE + else: +- inc_dir = get_path('platinclude').replace("/usr/local","/usr",1) ++ inc_dir = get_path('platinclude').replace("/usr/local","/usr",1)+(sys.pydebug and "_d" or "") + return os.path.join(inc_dir, 'pyconfig.h') + + def get_scheme_names(): +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -122,8 +122,8 @@ SCRIPTDIR= $(prefix)/lib + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) + LIBDEST= $(SCRIPTDIR)/python$(VERSION) +-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) +-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) ++INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) ++CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_EXT) + LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries +@@ -137,6 +137,8 @@ DESTSHARED= $(BINLIBDEST)/lib-dynload + EXE= @EXEEXT@ + BUILDEXE= @BUILDEXEEXT@ + ++DEBUG_EXT= @DEBUG_EXT@ ++ + # Short name and location for Mac OS X Python framework + UNIVERSALSDK=@UNIVERSALSDK@ + PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ +@@ -566,7 +568,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + $(AR) $(ARFLAGS) $@ $(sort $(MODOBJS)) + $(RANLIB) $@ + +-libpython$(VERSION).so: $(LIBRARY_OBJS) ++libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) $(PY_LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ +@@ -1202,8 +1204,8 @@ inclinstall: + $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h + + # Install the library and miscellaneous stuff needed for extending/embedding +-# This goes into $(exec_prefix) +-LIBPL= $(LIBP)/config ++# This goes into $(exec_prefix)$(DEBUG_EXT) ++LIBPL= $(LIBP)/config$(DEBUG_EXT) + + # pkgconfig directory + LIBPC= $(LIBDIR)/pkgconfig +Index: b/Misc/python-config.in +=================================================================== +--- a/Misc/python-config.in ++++ b/Misc/python-config.in +@@ -44,7 +44,7 @@ for opt in opt_flags: + print ' '.join(flags) + + elif opt in ('--libs', '--ldflags'): +- libs = ['-lpython' + pyver] ++ libs = ['-lpython' + pyver + (sys.pydebug and "_d" or "")] + libs += getvar('LIBS').split() + libs += getvar('SYSLIBS').split() + # add the prefix/lib/pythonX.Y/config dir, but only if there is no +Index: b/Python/dynload_shlib.c +=================================================================== +--- a/Python/dynload_shlib.c ++++ b/Python/dynload_shlib.c +@@ -46,6 +46,10 @@ const struct filedescr _PyImport_DynLoad + {"module.exe", "rb", C_EXTENSION}, + {"MODULE.EXE", "rb", C_EXTENSION}, + #else ++#ifdef Py_DEBUG ++ {"_d.so", "rb", C_EXTENSION}, ++ {"module_d.so", "rb", C_EXTENSION}, ++#endif + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, + #endif +Index: b/Python/sysmodule.c +=================================================================== +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -1524,6 +1524,12 @@ _PySys_Init(void) + PyString_FromString("legacy")); + #endif + ++#ifdef Py_DEBUG ++ PyDict_SetItemString(sysdict, "pydebug", Py_True); ++#else ++ PyDict_SetItemString(sysdict, "pydebug", Py_False); ++#endif ++ + #undef SET_SYS_FROM_STRING + if (PyErr_Occurred()) + return NULL; +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -760,7 +760,7 @@ AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) + if test -z "$LIBRARY" + then +- LIBRARY='libpython$(VERSION).a' ++ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' + fi + AC_MSG_RESULT($LIBRARY) + +@@ -906,8 +906,8 @@ if test $enable_shared = "yes"; then + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) +- LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' ++ LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' ++ BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + case $ac_sys_system in + FreeBSD*) +@@ -1050,6 +1050,12 @@ else AC_MSG_RESULT(no); Py_DEBUG='false' + fi], + [AC_MSG_RESULT(no)]) + ++if test "$Py_DEBUG" = 'true' ++then ++ DEBUG_EXT=_d ++fi ++AC_SUBST(DEBUG_EXT) ++ + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be + # merged with this chunk of code? + +@@ -2031,7 +2037,7 @@ then + esac + ;; + CYGWIN*) SO=.dll;; +- *) SO=.so;; ++ *) SO=$DEBUG_EXT.so;; + esac + else + # this might also be a termcap variable, see #610332 +Index: b/Lib/distutils/tests/test_build_ext.py +=================================================================== +--- a/Lib/distutils/tests/test_build_ext.py ++++ b/Lib/distutils/tests/test_build_ext.py +@@ -287,8 +287,8 @@ class BuildExtTestCase(support.TempdirMa + finally: + os.chdir(old_wd) + self.assertTrue(os.path.exists(so_file)) +- self.assertEqual(os.path.splitext(so_file)[-1], +- sysconfig.get_config_var('SO')) ++ so_ext = sysconfig.get_config_var('SO') ++ self.assertEqual(so_file[len(so_file)-len(so_ext):], so_ext) + so_dir = os.path.dirname(so_file) + self.assertEqual(so_dir, other_tmp_dir) + cmd.compiler = None +@@ -296,8 +296,7 @@ class BuildExtTestCase(support.TempdirMa + cmd.run() + so_file = cmd.get_outputs()[0] + self.assertTrue(os.path.exists(so_file)) +- self.assertEqual(os.path.splitext(so_file)[-1], +- sysconfig.get_config_var('SO')) ++ self.assertEqual(so_file[len(so_file)-len(so_ext):], so_ext) + so_dir = os.path.dirname(so_file) + self.assertEqual(so_dir, cmd.build_lib) + +Index: b/Lib/distutils/tests/test_build.py +=================================================================== +--- a/Lib/distutils/tests/test_build.py ++++ b/Lib/distutils/tests/test_build.py +@@ -20,10 +20,6 @@ class BuildTestCase(support.TempdirManag + # if not specified, plat_name gets the current platform + self.assertEqual(cmd.plat_name, get_platform()) + +- # build_purelib is build + lib +- wanted = os.path.join(cmd.build_base, 'lib') +- self.assertEqual(cmd.build_purelib, wanted) +- + # build_platlib is 'build/lib.platform-x.x[-pydebug]' + # examples: + # build/lib.macosx-10.3-i386-2.7 +@@ -34,6 +30,10 @@ class BuildTestCase(support.TempdirManag + wanted = os.path.join(cmd.build_base, 'lib' + plat_spec) + self.assertEqual(cmd.build_platlib, wanted) + ++ # build_purelib is build + lib ++ wanted = os.path.join(cmd.build_base, 'lib' + plat_spec) ++ self.assertEqual(cmd.build_purelib, wanted) ++ + # by default, build_lib = build_purelib + self.assertEqual(cmd.build_lib, cmd.build_purelib) + --- python2.7-2.7.12.orig/debian/patches/disable-sem-check.diff +++ python2.7-2.7.12/debian/patches/disable-sem-check.diff @@ -0,0 +1,30 @@ +# DP: Assume working semaphores on Linux, don't rely on running kernel for the check. + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -3957,6 +3957,11 @@ int main(void) { + [ac_cv_posix_semaphores_enabled=no], + [ac_cv_posix_semaphores_enabled=yes]) + ) ++case $ac_sys_system in ++ Linux*) ++ # assume enabled, see https://launchpad.net/bugs/630511 ++ ac_cv_posix_semaphores_enabled=yes ++esac + AC_MSG_RESULT($ac_cv_posix_semaphores_enabled) + if test $ac_cv_posix_semaphores_enabled = no + then +@@ -3993,6 +3998,11 @@ int main(void){ + [ac_cv_broken_sem_getvalue=yes], + [ac_cv_broken_sem_getvalue=yes]) + ) ++case $ac_sys_system in ++ Linux*) ++ # assume enabled, see https://launchpad.net/bugs/630511 ++ ac_cv_broken_sem_getvalue=no ++esac + AC_MSG_RESULT($ac_cv_broken_sem_getvalue) + if test $ac_cv_broken_sem_getvalue = yes + then --- python2.7-2.7.12.orig/debian/patches/disable-utimes.diff +++ python2.7-2.7.12/debian/patches/disable-utimes.diff @@ -0,0 +1,13 @@ +# DP: disable check for utimes function, which is broken in glibc-2.3.2 + +--- a/configure.ac ++++ b/configure.ac +@@ -2698,7 +2698,7 @@ + setsid setpgid setpgrp setuid setvbuf snprintf \ + sigaction siginterrupt sigrelse strftime \ + sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ +- truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty) ++ truncate uname unsetenv waitpid wait3 wait4 wcscoll _getpty) + + # For some functions, having a definition is not sufficient, since + # we want to take their address. --- python2.7-2.7.12.orig/debian/patches/distutils-install-layout.diff +++ python2.7-2.7.12/debian/patches/distutils-install-layout.diff @@ -0,0 +1,406 @@ +# DP: distutils: Add an option --install-layout=deb, which +# DP: - installs into $prefix/dist-packages instead of $prefix/site-packages. +# DP: - doesn't encode the python version into the egg name. + +Index: b/Doc/install/index.rst +=================================================================== +--- a/Doc/install/index.rst ++++ b/Doc/install/index.rst +@@ -255,6 +255,8 @@ is pure Python or contains extensions (" + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Platform | Standard installation location | Default value | Notes | + +=================+=====================================================+==================================================+=======+ ++| Debian/Ubuntu | :file:`{prefix}/lib/python{X.Y}/dist-packages` | :file:`/usr/local/lib/python{X.Y}/dist-packages` | \(0) | +++-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (pure) | :file:`{prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | + +-----------------+-----------------------------------------------------+--------------------------------------------------+-------+ + | Unix (non-pure) | :file:`{exec-prefix}/lib/python{X.Y}/site-packages` | :file:`/usr/local/lib/python{X.Y}/site-packages` | \(1) | +@@ -264,6 +266,14 @@ is pure Python or contains extensions (" + + Notes: + ++(0) ++ Starting with Python-2.6 Debian/Ubuntu uses for the Python which comes within ++ the Linux distribution a non-default name for the installation directory. This ++ is to avoid overwriting of the python modules which come with the distribution, ++ which unfortunately is the upstream behaviour of the installation tools. The ++ non-default name in :file:`/usr/local` is used not to overwrite a local python ++ installation (defaulting to :file:`/usr/local`). ++ + (1) + Most Linux distributions include Python as a standard part of the system, so + :file:`{prefix}` and :file:`{exec-prefix}` are usually both :file:`/usr` on +@@ -448,6 +458,15 @@ them to go in :file:`/usr/local/lib/pyth + + /usr/bin/python setup.py install --prefix=/usr/local + ++Starting with Python-2.6 Debian/Ubuntu does use ++:file:`/usr/lib/python{X.Y}/dist-packages` and ++:file:`/usr/local/lib/python{X.Y}/dist-packages` for the installation ++of python modules included in the Linux distribution. To overwrite ++the name of the site directory, explicitely use the :option:`--prefix` ++option, however make sure that the installation path is included in ++``sys.path``. For packaging of python modules for Debian/Ubuntu, use ++the new ``setup.py install`` option :option:`--install-layout=deb`. ++ + Another possibility is a network filesystem where the name used to write to a + remote directory is different from the name used to read it: for example, the + Python interpreter accessed as :file:`/usr/local/bin/python` might search for +@@ -699,6 +718,17 @@ Add-on Python modules might then belong + import them, this directory must be added to ``sys.path``. There are several + different ways to add the directory. + ++On Debian/Ubuntu, starting with Python-2.6 the convention for system ++installed packages is to put then in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory, and for locally ++installed packages is to put them in the ++:file:`/usr/lib/python{X.Y}/dist-packages/` directory. To share the ++locally installed packages for the system provided Python with the ++locally installed packages of a local python installation, make ++:file:`/usr/lib/python{X.Y}/dist-packages/` a symbolic link to the ++:file:`{...}/site-packages/` directory of your local python ++installation. ++ + The most convenient way is to add a path configuration file to a directory + that's already on Python's path, usually to the :file:`.../site-packages/` + directory. Path configuration files have an extension of :file:`.pth`, and each +Index: b/Lib/distutils/command/install.py +=================================================================== +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -47,6 +47,20 @@ INSTALL_SCHEMES = { + 'scripts': '$base/bin', + 'data' : '$base', + }, ++ 'unix_local': { ++ 'purelib': '$base/local/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/local/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/local/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/local/bin', ++ 'data' : '$base/local', ++ }, ++ 'deb_system': { ++ 'purelib': '$base/lib/python$py_version_short/dist-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/dist-packages', ++ 'headers': '$base/include/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, + 'unix_home': { + 'purelib': '$base/lib/python', + 'platlib': '$base/lib/python', +@@ -154,6 +168,9 @@ class install (Command): + + ('record=', None, + "filename in which to record list of installed files"), ++ ++ ('install-layout=', None, ++ "installation layout to choose (known values: deb, unix)"), + ] + + boolean_options = ['compile', 'force', 'skip-build', 'user'] +@@ -168,6 +185,7 @@ class install (Command): + self.exec_prefix = None + self.home = None + self.user = 0 ++ self.prefix_option = None + + # These select only the installation base; it's up to the user to + # specify the installation scheme (currently, that means supplying +@@ -189,6 +207,9 @@ class install (Command): + self.install_userbase = USER_BASE + self.install_usersite = USER_SITE + ++ # enable custom installation, known values: deb ++ self.install_layout = None ++ + self.compile = None + self.optimize = None + +@@ -421,6 +442,7 @@ class install (Command): + self.install_base = self.install_platbase = self.home + self.select_scheme("unix_home") + else: ++ self.prefix_option = self.prefix + if self.prefix is None: + if self.exec_prefix is not None: + raise DistutilsOptionError, \ +@@ -435,7 +457,23 @@ class install (Command): + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if self.install_layout: ++ if self.install_layout.lower() in ['deb']: ++ self.select_scheme("deb_system") ++ elif self.install_layout.lower() in ['posix', 'unix']: ++ self.select_scheme("unix_prefix") ++ else: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif (self.prefix_option and os.path.normpath(self.prefix) != '/usr/local') \ ++ or 'PYTHONUSERBASE' in os.environ \ ++ or 'real_prefix' in sys.__dict__: ++ self.select_scheme("unix_prefix") ++ else: ++ if os.path.normpath(self.prefix) == '/usr/local': ++ self.select_scheme("deb_system") ++ else: ++ self.select_scheme("unix_local") + + # finalize_unix () + +Index: b/Lib/distutils/command/install_egg_info.py +=================================================================== +--- a/Lib/distutils/command/install_egg_info.py ++++ b/Lib/distutils/command/install_egg_info.py +@@ -14,18 +14,37 @@ class install_egg_info(Command): + description = "Install package's PKG-INFO metadata as an .egg-info file" + user_options = [ + ('install-dir=', 'd', "directory to install to"), ++ ('install-layout', None, "custom installation layout"), + ] + + def initialize_options(self): + self.install_dir = None ++ self.install_layout = None ++ self.prefix_option = None + + def finalize_options(self): + self.set_undefined_options('install_lib',('install_dir','install_dir')) +- basename = "%s-%s-py%s.egg-info" % ( +- to_filename(safe_name(self.distribution.get_name())), +- to_filename(safe_version(self.distribution.get_version())), +- sys.version[:3] +- ) ++ self.set_undefined_options('install',('install_layout','install_layout')) ++ self.set_undefined_options('install',('prefix_option','prefix_option')) ++ if self.install_layout: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) ++ if not self.install_layout.lower() in ['deb']: ++ raise DistutilsOptionError( ++ "unknown value for --install-layout") ++ elif self.prefix_option or 'real_prefix' in sys.__dict__: ++ basename = "%s-%s-py%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())), ++ sys.version[:3] ++ ) ++ else: ++ basename = "%s-%s.egg-info" % ( ++ to_filename(safe_name(self.distribution.get_name())), ++ to_filename(safe_version(self.distribution.get_version())) ++ ) + self.target = os.path.join(self.install_dir, basename) + self.outputs = [self.target] + +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -115,6 +115,7 @@ def get_python_lib(plat_specific=0, stan + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ ++ is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local') + if prefix is None: + prefix = plat_specific and EXEC_PREFIX or PREFIX + +@@ -123,6 +124,8 @@ def get_python_lib(plat_specific=0, stan + "lib", "python" + get_python_version()) + if standard_lib: + return libpython ++ elif is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__: ++ return os.path.join(libpython, "dist-packages") + else: + return os.path.join(libpython, "site-packages") + +Index: b/Lib/site.py +=================================================================== +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -273,6 +273,13 @@ def addusersitepackages(known_paths): + + if ENABLE_USER_SITE and os.path.isdir(user_site): + addsitedir(user_site, known_paths) ++ if ENABLE_USER_SITE: ++ for dist_libdir in ("local/lib", "lib"): ++ user_site = os.path.join(USER_BASE, dist_libdir, ++ "python" + sys.version[:3], ++ "dist-packages") ++ if os.path.isdir(user_site): ++ addsitedir(user_site, known_paths) + return known_paths + + def getsitepackages(): +Index: b/Lib/sysconfig.py +=================================================================== +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -16,6 +16,26 @@ _INSTALL_SCHEMES = { + 'scripts': '{base}/bin', + 'data': '{base}', + }, ++ 'posix_local': { ++ 'stdlib': '{base}/lib/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'purelib': '{base}/local/lib/python{py_version_short}/dist-packages', ++ 'platlib': '{platbase}/local/lib/python{py_version_short}/dist-packages', ++ 'include': '{base}/local/include/python{py_version_short}', ++ 'platinclude': '{platbase}/local/include/python{py_version_short}', ++ 'scripts': '{base}/local/bin', ++ 'data': '{base}/local', ++ }, ++ 'deb_system': { ++ 'stdlib': '{base}/lib/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'purelib': '{base}/lib/python{py_version_short}/dist-packages', ++ 'platlib': '{platbase}/lib/python{py_version_short}/dist-packages', ++ 'include': '{base}/include/python{py_version_short}', ++ 'platinclude': '{platbase}/include/python{py_version_short}', ++ 'scripts': '{base}/bin', ++ 'data': '{base}', ++ }, + 'posix_home': { + 'stdlib': '{base}/lib/python', + 'platstdlib': '{base}/lib/python', +@@ -129,7 +149,7 @@ def is_python_build(): + _PYTHON_BUILD = is_python_build() + + if _PYTHON_BUILD: +- for scheme in ('posix_prefix', 'posix_home'): ++ for scheme in ('posix_prefix', 'posix_local', 'deb_system', 'posix_home'): + _INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include' + _INSTALL_SCHEMES[scheme]['platinclude'] = '{srcdir}' + +@@ -163,8 +183,11 @@ def _expand_vars(scheme, vars): + + def _get_default_scheme(): + if os.name == 'posix': +- # the default scheme for posix is posix_prefix +- return 'posix_prefix' ++ # the default scheme for posix on Debian/Ubuntu is posix_local ++ # FIXME: return dist-packages/posix_prefix only for ++ # is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__ ++ # is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local') ++ return 'posix_local' + return os.name + + def _getuserbase(): +@@ -310,7 +333,7 @@ def get_makefile_filename(): + """Return the path of the Makefile.""" + if _PYTHON_BUILD: + return os.path.join(_PROJECT_BASE, "Makefile") +- return os.path.join(get_path('platstdlib'), "config", "Makefile") ++ return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config", "Makefile") + + # Issue #22199: retain undocumented private name for compatibility + _get_makefile_filename = get_makefile_filename +@@ -442,7 +465,7 @@ def get_config_h_filename(): + else: + inc_dir = _PROJECT_BASE + else: +- inc_dir = get_path('platinclude') ++ inc_dir = get_path('platinclude').replace("/usr/local","/usr",1) + return os.path.join(inc_dir, 'pyconfig.h') + + def get_scheme_names(): +Index: b/Lib/test/test_import.py +=================================================================== +--- a/Lib/test/test_import.py ++++ b/Lib/test/test_import.py +@@ -301,7 +301,7 @@ class ImportTests(unittest.TestCase): + with check_warnings(('', ImportWarning)): + # Just a random non-package directory we always expect to be + # somewhere in sys.path... +- self.assertRaises(ImportError, __import__, "site-packages") ++ self.assertRaises(ImportError, __import__, "dist-packages") + + def test_import_by_filename(self): + path = os.path.abspath(TESTFN) +Index: b/Lib/test/test_site.py +=================================================================== +--- a/Lib/test/test_site.py ++++ b/Lib/test/test_site.py +@@ -247,10 +247,13 @@ class HelperFunctionsTests(unittest.Test + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc + self.assertEqual(len(dirs), 2) +- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], +- 'site-packages') ++ wanted = os.path.join('xoxo', 'local', 'lib', ++ 'python' + sys.version[:3], ++ 'dist-packages') + self.assertEqual(dirs[0], wanted) +- wanted = os.path.join('xoxo', 'lib', 'site-python') ++ wanted = os.path.join('xoxo', 'lib', ++ 'python' + sys.version[:3], ++ 'dist-packages') + self.assertEqual(dirs[1], wanted) + else: + # other platforms +Index: b/Lib/test/test_sysconfig.py +=================================================================== +--- a/Lib/test/test_sysconfig.py ++++ b/Lib/test/test_sysconfig.py +@@ -239,8 +239,8 @@ class TestSysConfig(unittest.TestCase): + self.assertTrue(os.path.isfile(config_h), config_h) + + def test_get_scheme_names(self): +- wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', +- 'posix_home', 'posix_prefix', 'posix_user') ++ wanted = ('deb_system', 'nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', ++ 'posix_home', 'posix_local', 'posix_prefix', 'posix_user') + self.assertEqual(get_scheme_names(), wanted) + + @unittest.skipIf(sys.platform.startswith('win'), +Index: b/Lib/distutils/tests/test_install.py +=================================================================== +--- a/Lib/distutils/tests/test_install.py ++++ b/Lib/distutils/tests/test_install.py +@@ -193,7 +193,7 @@ class InstallTestCase(support.TempdirMan + + found = [os.path.basename(line) for line in content.splitlines()] + expected = ['hello.py', 'hello.pyc', 'sayhi', +- 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]] ++ 'UNKNOWN-0.0.0.egg-info'] + self.assertEqual(found, expected) + + def test_record_extensions(self): +@@ -223,7 +223,7 @@ class InstallTestCase(support.TempdirMan + + found = [os.path.basename(line) for line in content.splitlines()] + expected = [_make_ext_name('xx'), +- 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]] ++ 'UNKNOWN-0.0.0.egg-info'] + self.assertEqual(found, expected) + + def test_debug_mode(self): +Index: b/Lib/distutils/tests/test_bdist_dumb.py +=================================================================== +--- a/Lib/distutils/tests/test_bdist_dumb.py ++++ b/Lib/distutils/tests/test_bdist_dumb.py +@@ -87,7 +87,7 @@ class BuildDumbTestCase(support.TempdirM + fp.close() + + contents = sorted(os.path.basename(fn) for fn in contents) +- wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py'] ++ wanted = ['foo-0.1.egg-info', 'foo.py'] + if not sys.dont_write_bytecode: + wanted.append('foo.pyc') + self.assertEqual(contents, sorted(wanted)) +Index: b/Lib/pydoc.py +=================================================================== +--- a/Lib/pydoc.py ++++ b/Lib/pydoc.py +@@ -391,6 +391,7 @@ class Doc: + 'marshal', 'posix', 'signal', 'sys', + 'thread', 'zipimport') or + (file.startswith(basedir) and ++ not file.startswith(os.path.join(basedir, 'dist-packages')) and + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree', 'test.pydoc_mod')): + if docloc.startswith("http://"): --- python2.7-2.7.12.orig/debian/patches/distutils-link.diff +++ python2.7-2.7.12/debian/patches/distutils-link.diff @@ -0,0 +1,20 @@ +# DP: Don't add standard library dirs to library_dirs and runtime_library_dirs. + +Index: b/Lib/distutils/unixccompiler.py +=================================================================== +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -157,7 +157,12 @@ class UnixCCompiler(CCompiler): + objects, output_dir = self._fix_object_args(objects, output_dir) + libraries, library_dirs, runtime_library_dirs = \ + self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) +- ++ # filter out standard library paths, which are not explicitely needed ++ # for linking ++ library_dirs = [dir for dir in library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] ++ runtime_library_dirs = [dir for dir in runtime_library_dirs ++ if not dir in ('/lib', '/lib64', '/usr/lib', '/usr/lib64')] + lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, + libraries) + if type(output_dir) not in (StringType, NoneType): --- python2.7-2.7.12.orig/debian/patches/distutils-sysconfig.diff +++ python2.7-2.7.12/debian/patches/distutils-sysconfig.diff @@ -0,0 +1,53 @@ +# DP: Allow setting BASECFLAGS, OPT and EXTRA_LDFLAGS (like, CC, CXX, CPP, +# DP: CFLAGS, CPPFLAGS, CCSHARED, LDSHARED) from the environment. + +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -174,10 +174,12 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO', 'AR', +- 'ARFLAGS') ++ (cc, cxx, opt, cflags, extra_cflags, basecflags, ++ ccshared, ldshared, so_ext, ar, ar_flags, ++ configure_cppflags, configure_cflags, configure_ldflags) = \ ++ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS', ++ 'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS', ++ 'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS') + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -198,13 +200,27 @@ def customize_compiler(compiler): + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ elif configure_ldflags: ++ ldshared = ldshared + ' ' + configure_ldflags ++ if 'BASECFLAGS' in os.environ: ++ basecflags = os.environ['BASECFLAGS'] ++ if 'OPT' in os.environ: ++ opt = os.environ['OPT'] ++ cflags = ' '.join(str(x) for x in (basecflags, opt, extra_cflags) if x) + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = ' '.join(str(x) for x in (opt, basecflags, os.environ['CFLAGS'], extra_cflags) if x) + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ elif configure_cflags: ++ cflags = ' '.join(str(x) for x in (opt, basecflags, configure_cflags, extra_cflags) if x) ++ ldshared = ldshared + ' ' + configure_cflags + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ elif configure_cppflags: ++ cpp = cpp + ' ' + configure_cppflags ++ cflags = cflags + ' ' + configure_cppflags ++ ldshared = ldshared + ' ' + configure_cppflags + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: --- python2.7-2.7.12.orig/debian/patches/doc-nodownload.diff +++ python2.7-2.7.12/debian/patches/doc-nodownload.diff @@ -0,0 +1,13 @@ +# DP: Don't try to download documentation tools + +--- a/Doc/Makefile ++++ b/Doc/Makefile +@@ -57,7 +57,7 @@ + + update: clean checkout + +-build: checkout ++build: + mkdir -p build/$(BUILDER) build/doctrees + $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) + @echo --- python2.7-2.7.12.orig/debian/patches/enable-fpectl.diff +++ python2.7-2.7.12/debian/patches/enable-fpectl.diff @@ -0,0 +1,16 @@ +# DP: Enable the build of the fpectl module. + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1399,6 +1399,9 @@ class PyBuildExt(build_ext): + else: + missing.append('_curses_panel') + ++ #fpectl fpectlmodule.c ... ++ exts.append( Extension('fpectl', ['fpectlmodule.c']) ) ++ + # Andrew Kuchling's zlib module. Note that some versions of zlib + # 1.1.3 have security problems. See CERT Advisory CA-2002-07: + # http://www.cert.org/advisories/CA-2002-07.html --- python2.7-2.7.12.orig/debian/patches/enable-sqlite-loadext.diff +++ python2.7-2.7.12/debian/patches/enable-sqlite-loadext.diff @@ -0,0 +1,15 @@ +# DP: Allow loading of extensions in the sqlite module + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1200,7 +1200,7 @@ class PyBuildExt(build_ext): + sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"')) + + # Comment this out if you want the sqlite3 module to be able to load extensions. +- sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) ++ # sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1")) + + if host_platform == 'darwin': + # In every directory on the search path search for a dynamic --- python2.7-2.7.12.orig/debian/patches/ensurepip-disabled.diff +++ python2.7-2.7.12/debian/patches/ensurepip-disabled.diff @@ -0,0 +1,42 @@ +# DP: Disable ensurepip in Debian for now. + +--- a/Lib/ensurepip/__init__.py ++++ b/Lib/ensurepip/__init__.py +@@ -12,6 +12,21 @@ + + __all__ = ["version", "bootstrap"] + ++def _ensurepip_is_disabled_in_debian(): ++ if True: ++ print ('''\ ++ensurepip is disabled in Debian/Ubuntu for the system python. ++ ++Python modules For the system python are usually handled by dpkg and apt-get. ++ ++ apt-get install python- ++ ++Install the python-pip package to use pip itself. Using pip together ++with the system python might have unexpected results for any system installed ++module, so use it on your own risk, or make sure to only use it in virtual ++environments. ++''') ++ sys.exit(1) + + # pip currently requires ssl support, so we try to provide a nicer + # error message when that is missing (http://bugs.python.org/issue19744) +@@ -47,6 +62,7 @@ + """ + Returns a string specifying the bundled version of pip. + """ ++ _ensurepip_is_disabled_in_debian() + whl_name = 'pip' + wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % whl_name) + if len(wheel_names) == 1: +@@ -75,6 +91,7 @@ + + Note that calling this function will alter both sys.path and os.environ. + """ ++ _ensurepip_is_disabled_in_debian() + if altinstall and default_pip: + raise ValueError("Cannot use altinstall and default_pip together") + --- python2.7-2.7.12.orig/debian/patches/ensurepip-wheels.diff +++ python2.7-2.7.12/debian/patches/ensurepip-wheels.diff @@ -0,0 +1,145 @@ +# DP: Let ensurepip use the system wheels, not the ones from the python source. + +Index: b/Lib/ensurepip/__init__.py +=================================================================== +--- a/Lib/ensurepip/__init__.py ++++ b/Lib/ensurepip/__init__.py +@@ -1,6 +1,7 @@ + #!/usr/bin/env python2 + from __future__ import print_function + ++import glob + import os + import os.path + import pkgutil +@@ -12,13 +13,9 @@ import tempfile + __all__ = ["version", "bootstrap"] + + +-_SETUPTOOLS_VERSION = "25.2.0" +- +-_PIP_VERSION = "8.1.2" +- + # pip currently requires ssl support, so we try to provide a nicer + # error message when that is missing (http://bugs.python.org/issue19744) +-_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION)) ++_MISSING_SSL_MESSAGE = ("pip requires SSL/TLS") + try: + import ssl + except ImportError: +@@ -31,8 +28,8 @@ else: + pass + + _PROJECTS = [ +- ("setuptools", _SETUPTOOLS_VERSION), +- ("pip", _PIP_VERSION), ++ "setuptools", ++ "pip", + ] + + +@@ -50,7 +47,11 @@ def version(): + """ + Returns a string specifying the bundled version of pip. + """ +- return _PIP_VERSION ++ whl_name = 'pip' ++ wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % whl_name) ++ if len(wheel_names) == 1: ++ return os.path.basename(wheel_names[0]).split('-')[1] ++ raise RuntimeError('missing dependency wheel %s. Installation of the python-%s-whl package is needed to use ensurepip.' % (whl_name, whl_name)) + + + def _disable_pip_configuration_settings(): +@@ -93,21 +94,53 @@ def bootstrap(root=None, upgrade=False, + # omit pip and easy_install + os.environ["ENSUREPIP_OPTIONS"] = "install" + ++ # Debian: The bundled wheels are useless to us because we must use ones ++ # crafted from source code in the archive. As we build the virtual ++ # environment, copy the wheels from the system location into the virtual ++ # environment, and place those wheels on sys.path. ++ def copy_wheels(wheels, destdir, paths): ++ for project in wheels: ++ wheel_names = glob.glob( ++ '/usr/share/python-wheels/{}-*.whl'.format(project)) ++ if len(wheel_names) == 0: ++ raise RuntimeError('missing dependency wheel %s. Installation of the python-%s-whl package is needed to use ensurepip.' % (project, project)) ++ assert len(wheel_names) == 1, wheel_names ++ wheel_name = os.path.basename(wheel_names[0]) ++ path = os.path.join('/usr/share/python-wheels', wheel_name) ++ with open(path, 'rb') as fp: ++ whl = fp.read() ++ dest = os.path.join(destdir, wheel_name) ++ with open(dest, 'wb') as fp: ++ fp.write(whl) ++ paths.append(dest) ++ ++ # check that the python-{pip,setuptools}-whl packages are installed ++ missing = [] ++ for project in reversed(_PROJECTS): ++ wheel_names = glob.glob('/usr/share/python-wheels/%s-*.whl' % project) ++ if len(wheel_names) != 1: ++ missing.append(project) ++ if missing: ++ raise RuntimeError('missing wheel(s) %s. Installation of the %s package(s) is needed to use ensurepip.' \ ++ % (', '.join([missing]), ++ ', '.join(['python-%s-whl' % m for m in missing])) \ ++ ) ++ + tmpdir = tempfile.mkdtemp() ++ ++ for project in _PROJECTS: ++ try: ++ with open('/usr/share/python-wheels/%s.dependencies' % project) as fp: ++ dependencies = [line[:-1].split()[0] for line in fp.readlines()] ++ except IOError: ++ dependencies = [] ++ copy_wheels(dependencies, tmpdir, sys.path) ++ + try: + # Put our bundled wheels into a temporary directory and construct the + # additional paths that need added to sys.path + additional_paths = [] +- for project, version in _PROJECTS: +- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) +- whl = pkgutil.get_data( +- "ensurepip", +- "_bundled/{}".format(wheel_name), +- ) +- with open(os.path.join(tmpdir, wheel_name), "wb") as fp: +- fp.write(whl) +- +- additional_paths.append(os.path.join(tmpdir, wheel_name)) ++ copy_wheels(_PROJECTS, tmpdir, additional_paths) + + # Construct the arguments to be passed to the pip command + args = ["install", "--no-index", "--find-links", tmpdir] +@@ -120,7 +153,7 @@ def bootstrap(root=None, upgrade=False, + if verbosity: + args += ["-" + "v" * verbosity] + +- _run_pip(args + [p[0] for p in _PROJECTS], additional_paths) ++ _run_pip(args + _PROJECTS, additional_paths) + finally: + shutil.rmtree(tmpdir, ignore_errors=True) + +@@ -137,7 +170,8 @@ def _uninstall_helper(verbosity=0): + return + + # If the pip version doesn't match the bundled one, leave it alone +- if pip.__version__ != _PIP_VERSION: ++ # Disabled for Debian, always using the version from the python3-pip package. ++ if False and pip.__version__ != _PIP_VERSION: + msg = ("ensurepip will only uninstall a matching version " + "({!r} installed, {!r} bundled)") + print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr) +@@ -151,7 +185,7 @@ def _uninstall_helper(verbosity=0): + if verbosity: + args += ["-" + "v" * verbosity] + +- _run_pip(args + [p[0] for p in reversed(_PROJECTS)]) ++ _run_pip(args + reversed(_PROJECTS)) + + + def _main(argv=None): --- python2.7-2.7.12.orig/debian/patches/ext-no-libpython-link.diff +++ python2.7-2.7.12/debian/patches/ext-no-libpython-link.diff @@ -0,0 +1,24 @@ +# DP: Don't link extensions with the shared libpython library. + +Index: b/Lib/distutils/command/build_ext.py +=================================================================== +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -236,7 +236,7 @@ class build_ext (Command): + # For building extensions with a shared Python library, + # Python's library directory must be appended to library_dirs + # See Issues: #1600860, #4366 +- if (sysconfig.get_config_var('Py_ENABLE_SHARED')): ++ if False and (sysconfig.get_config_var('Py_ENABLE_SHARED')): + if not sysconfig.python_build: + # building third party extensions + self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) +@@ -757,7 +757,7 @@ class build_ext (Command): + return ext.libraries + else: + from distutils import sysconfig +- if sysconfig.get_config_var('Py_ENABLE_SHARED'): ++ if False and sysconfig.get_config_var('Py_ENABLE_SHARED'): + template = "python%d.%d" + pythonlib = (template % + (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) --- python2.7-2.7.12.orig/debian/patches/fix-sslv3-test.diff +++ python2.7-2.7.12/debian/patches/fix-sslv3-test.diff @@ -0,0 +1,18 @@ +Description: properly handle Ubuntu's openssl having OP_NO_SSLv3 forced on by default +Author: Marc Deslauriers +Forwarded: yes, http://bugs.python.org/issue25724 + +Index: b/Lib/test/test_ssl.py +=================================================================== +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -752,7 +752,8 @@ class ContextTests(unittest.TestCase): + self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3, + ctx.options) + ctx.options = 0 +- self.assertEqual(0, ctx.options) ++ # Ubuntu has OP_NO_SSLv3 forced on by default ++ self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3) + else: + with self.assertRaises(ValueError): + ctx.options = 0 --- python2.7-2.7.12.orig/debian/patches/hg-updates.diff +++ python2.7-2.7.12/debian/patches/hg-updates.diff @@ -0,0 +1,9892 @@ +# DP: hg updates of the 2.7 release branch (until 2016-09-01). + +# hg diff -r v2.7.12 | filterdiff --exclude=.*ignore --exclude=.hg* --remove-timestamps + +diff -r d33e0cf91556 Demo/tix/INSTALL.txt +--- a/Demo/tix/INSTALL.txt ++++ b/Demo/tix/INSTALL.txt +@@ -4,7 +4,7 @@ + ---------------- + + 0) To use Tix.py, you need Tcl/Tk (V8.3.3), Tix (V8.1.1) and Python (V2.1.1). +- Tix.py has been written and tested on a Intel Pentium running RH Linux 5.2 ++ Tix.py has been written and tested on an Intel Pentium running RH Linux 5.2 + and Mandrake Linux 7.0 and Windows with the above mentioned packages. + + Older versions, e.g. Tix 4.1 and Tk 8.0, might also work. +diff -r d33e0cf91556 Demo/tix/samples/Balloon.py +--- a/Demo/tix/samples/Balloon.py ++++ b/Demo/tix/samples/Balloon.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/BtnBox.py +--- a/Demo/tix/samples/BtnBox.py ++++ b/Demo/tix/samples/BtnBox.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/CmpImg.py +--- a/Demo/tix/samples/CmpImg.py ++++ b/Demo/tix/samples/CmpImg.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/ComboBox.py +--- a/Demo/tix/samples/ComboBox.py ++++ b/Demo/tix/samples/ComboBox.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/Control.py +--- a/Demo/tix/samples/Control.py ++++ b/Demo/tix/samples/Control.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/DirList.py +--- a/Demo/tix/samples/DirList.py ++++ b/Demo/tix/samples/DirList.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/DirTree.py +--- a/Demo/tix/samples/DirTree.py ++++ b/Demo/tix/samples/DirTree.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/NoteBook.py +--- a/Demo/tix/samples/NoteBook.py ++++ b/Demo/tix/samples/NoteBook.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/OptMenu.py +--- a/Demo/tix/samples/OptMenu.py ++++ b/Demo/tix/samples/OptMenu.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/PanedWin.py +--- a/Demo/tix/samples/PanedWin.py ++++ b/Demo/tix/samples/PanedWin.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/PopMenu.py +--- a/Demo/tix/samples/PopMenu.py ++++ b/Demo/tix/samples/PopMenu.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/SHList1.py +--- a/Demo/tix/samples/SHList1.py ++++ b/Demo/tix/samples/SHList1.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/tix/samples/SHList2.py +--- a/Demo/tix/samples/SHList2.py ++++ b/Demo/tix/samples/SHList2.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidget": it must have a +diff -r d33e0cf91556 Demo/tix/samples/Tree.py +--- a/Demo/tix/samples/Tree.py ++++ b/Demo/tix/samples/Tree.py +@@ -2,7 +2,7 @@ + # + # $Id$ + # +-# Tix Demostration Program ++# Tix Demonstration Program + # + # This sample program is structured in such a way so that it can be + # executed from the Tix demo program "tixwidgets.py": it must have a +diff -r d33e0cf91556 Demo/turtle/tdemo_I_dontlike_tiltdemo.py +--- a/Demo/turtle/tdemo_I_dontlike_tiltdemo.py ++++ b/Demo/turtle/tdemo_I_dontlike_tiltdemo.py +@@ -3,7 +3,7 @@ + + tdemo-I_dont_like_tiltdemo.py + +-Demostrates ++Demonstrates + (a) use of a tilted ellipse as + turtle shape + (b) stamping that shape +diff -r d33e0cf91556 Doc/Makefile +--- a/Doc/Makefile ++++ b/Doc/Makefile +@@ -161,7 +161,7 @@ + -make suspicious + + # for quick rebuilds (HTML only) +-autobuild-html: ++autobuild-dev-html: + make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + + # for stable releases: only build if not in pre-release stage (alpha, beta) +@@ -173,3 +173,9 @@ + esac + @make autobuild-dev + ++autobuild-stable-html: ++ @case $(DISTVERSION) in *[ab]*) \ ++ echo "Not building; $(DISTVERSION) is not a release version."; \ ++ exit 1;; \ ++ esac ++ @make autobuild-dev-html +diff -r d33e0cf91556 Doc/c-api/class.rst +--- a/Doc/c-api/class.rst ++++ b/Doc/c-api/class.rst +@@ -61,5 +61,5 @@ + + Create a new instance of a specific class without calling its constructor. + *class* is the class of new object. The *dict* parameter will be used as the +- object's :attr:`__dict__`; if *NULL*, a new dictionary will be created for the ++ object's :attr:`~object.__dict__`; if *NULL*, a new dictionary will be created for the + instance. +diff -r d33e0cf91556 Doc/c-api/module.rst +--- a/Doc/c-api/module.rst ++++ b/Doc/c-api/module.rst +@@ -51,10 +51,10 @@ + .. index:: single: __dict__ (module attribute) + + Return the dictionary object that implements *module*'s namespace; this object +- is the same as the :attr:`__dict__` attribute of the module object. This ++ is the same as the :attr:`~object.__dict__` attribute of the module object. This + function never fails. It is recommended extensions use other + :c:func:`PyModule_\*` and :c:func:`PyObject_\*` functions rather than directly +- manipulate a module's :attr:`__dict__`. ++ manipulate a module's :attr:`~object.__dict__`. + + + .. c:function:: char* PyModule_GetName(PyObject *module) +diff -r d33e0cf91556 Doc/c-api/structures.rst +--- a/Doc/c-api/structures.rst ++++ b/Doc/c-api/structures.rst +@@ -159,9 +159,8 @@ + The :attr:`ml_flags` field is a bitfield which can include the following flags. + The individual flags indicate either a calling convention or a binding + convention. Of the calling convention flags, only :const:`METH_VARARGS` and +-:const:`METH_KEYWORDS` can be combined (but note that :const:`METH_KEYWORDS` +-alone is equivalent to ``METH_VARARGS | METH_KEYWORDS``). Any of the calling +-convention flags can be combined with a binding flag. ++:const:`METH_KEYWORDS` can be combined. Any of the calling convention flags ++can be combined with a binding flag. + + + .. data:: METH_VARARGS +diff -r d33e0cf91556 Doc/c-api/typeobj.rst +--- a/Doc/c-api/typeobj.rst ++++ b/Doc/c-api/typeobj.rst +@@ -117,10 +117,10 @@ + For statically allocated type objects, the tp_name field should contain a dot. + Everything before the last dot is made accessible as the :attr:`__module__` + attribute, and everything after the last dot is made accessible as the +- :attr:`__name__` attribute. ++ :attr:`~definition.__name__` attribute. + + If no dot is present, the entire :c:member:`~PyTypeObject.tp_name` field is made accessible as the +- :attr:`__name__` attribute, and the :attr:`__module__` attribute is undefined ++ :attr:`~definition.__name__` attribute, and the :attr:`__module__` attribute is undefined + (unless explicitly set in the dictionary, as explained above). This means your + type will be impossible to pickle. + +diff -r d33e0cf91556 Doc/distutils/packageindex.rst +--- a/Doc/distutils/packageindex.rst ++++ b/Doc/distutils/packageindex.rst +@@ -235,7 +235,9 @@ + + To prevent registering broken reStructuredText content, you can use the + :program:`rst2html` program that is provided by the :mod:`docutils` package and +-check the ``long_description`` from the command line:: ++check the ``long_description`` from the command line: ++ ++.. code-block:: shell-session + + $ python setup.py --long-description | rst2html.py > output.html + +diff -r d33e0cf91556 Doc/extending/building.rst +--- a/Doc/extending/building.rst ++++ b/Doc/extending/building.rst +@@ -24,7 +24,9 @@ + extension. + + A distutils package contains a driver script, :file:`setup.py`. This is a plain +-Python file, which, in the most simple case, could look like this:: ++Python file, which, in the most simple case, could look like this: ++ ++.. code-block:: python + + from distutils.core import setup, Extension + +@@ -64,7 +66,9 @@ + + In many cases, building an extension is more complex, since additional + preprocessor defines and libraries may be needed. This is demonstrated in the +-example below. :: ++example below. ++ ++.. code-block:: python + + from distutils.core import setup, Extension + +@@ -129,4 +133,3 @@ + python setup.py bdist_wininst + python setup.py bdist_rpm + python setup.py bdist_dumb +- +diff -r d33e0cf91556 Doc/extending/embedding.rst +--- a/Doc/extending/embedding.rst ++++ b/Doc/extending/embedding.rst +@@ -151,7 +151,9 @@ + c = c + b + return c + +-then the result should be:: ++then the result should be: ++ ++.. code-block:: shell-session + + $ call multiply multiply 3 2 + Will compute 3 times 2 +@@ -274,16 +276,20 @@ + be directly useful to you: + + * ``pythonX.Y-config --cflags`` will give you the recommended flags when +- compiling:: ++ compiling: + +- $ /opt/bin/python2.7-config --cflags +- -I/opt/include/python2.7 -fno-strict-aliasing -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes ++ .. code-block:: shell-session ++ ++ $ /opt/bin/python2.7-config --cflags ++ -I/opt/include/python2.7 -fno-strict-aliasing -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes + + * ``pythonX.Y-config --ldflags`` will give you the recommended flags when +- linking:: ++ linking: + +- $ /opt/bin/python2.7-config --ldflags +- -L/opt/lib/python2.7/config -lpthread -ldl -lutil -lm -lpython2.7 -Xlinker -export-dynamic ++ .. code-block:: shell-session ++ ++ $ /opt/bin/python2.7-config --ldflags ++ -L/opt/lib/python2.7/config -lpthread -ldl -lutil -lm -lpython2.7 -Xlinker -export-dynamic + + .. note:: + To avoid confusion between several Python installations (and especially +diff -r d33e0cf91556 Doc/extending/extending.rst +--- a/Doc/extending/extending.rst ++++ b/Doc/extending/extending.rst +@@ -763,7 +763,9 @@ + format unit, it returns whatever object is described by that format unit. To + force it to return a tuple of size 0 or one, parenthesize the format string. + +-Examples (to the left the call, to the right the resulting Python value):: ++Examples (to the left the call, to the right the resulting Python value): ++ ++.. code-block:: none + + Py_BuildValue("") None + Py_BuildValue("i", 123) 123 +diff -r d33e0cf91556 Doc/extending/newtypes.rst +--- a/Doc/extending/newtypes.rst ++++ b/Doc/extending/newtypes.rst +@@ -223,7 +223,9 @@ + setup(name="noddy", version="1.0", + ext_modules=[Extension("noddy", ["noddy.c"])]) + +-in a file called :file:`setup.py`; then typing :: ++in a file called :file:`setup.py`; then typing ++ ++.. code-block:: shell-session + + $ python setup.py build + +@@ -1580,4 +1582,3 @@ + .. [#] Even in the third version, we aren't guaranteed to avoid cycles. Instances of + string subclasses are allowed and string subclasses could allow cycles even if + normal strings don't. +- +diff -r d33e0cf91556 Doc/faq/extending.rst +--- a/Doc/faq/extending.rst ++++ b/Doc/faq/extending.rst +@@ -156,6 +156,8 @@ + + Sample code and use for catching stdout: + ++.. code-block:: pycon ++ + >>> class StdoutCatcher: + ... def __init__(self): + ... self.data = '' +@@ -219,11 +221,15 @@ + When using GDB with dynamically loaded extensions, you can't set a breakpoint in + your extension until your extension is loaded. + +-In your ``.gdbinit`` file (or interactively), add the command:: ++In your ``.gdbinit`` file (or interactively), add the command: ++ ++.. code-block:: none + + br _PyImport_LoadDynamicModule + +-Then, when you run GDB:: ++Then, when you run GDB: ++ ++.. code-block:: shell-session + + $ gdb /local/bin/python + gdb) run myscript.py +@@ -469,6 +475,8 @@ + You can check the size of the Unicode character a Python interpreter is using by + checking the value of sys.maxunicode: + ++.. code-block:: pycon ++ + >>> import sys + >>> if sys.maxunicode > 65535: + ... print 'UCS4 build' +diff -r d33e0cf91556 Doc/howto/logging-cookbook.rst +--- a/Doc/howto/logging-cookbook.rst ++++ b/Doc/howto/logging-cookbook.rst +@@ -998,7 +998,9 @@ + logger = logging.getLogger('mylogger') + logger.debug('A debug message') + +-To run this, you will probably need to run as ``root``:: ++To run this, you will probably need to run as ``root``: ++ ++.. code-block:: shell-session + + $ sudo python3.3 chowntest.py + $ cat chowntest.log +@@ -1500,7 +1502,9 @@ + completion, the status is as it was before so message #6 appears (like message + #1) whereas message #7 doesn't (just like message #2). + +-If we run the resulting script, the result is as follows:: ++If we run the resulting script, the result is as follows: ++ ++.. code-block:: shell-session + + $ python logctx.py + 1. This should appear just once on stderr. +@@ -1510,12 +1514,16 @@ + 6. This should appear just once on stderr. + + If we run it again, but pipe ``stderr`` to ``/dev/null``, we see the following, +-which is the only message written to ``stdout``:: ++which is the only message written to ``stdout``: ++ ++.. code-block:: shell-session + + $ python logctx.py 2>/dev/null + 5. This should appear twice - once on stderr and once on stdout. + +-Once again, but piping ``stdout`` to ``/dev/null``, we get:: ++Once again, but piping ``stdout`` to ``/dev/null``, we get: ++ ++.. code-block:: shell-session + + $ python logctx.py >/dev/null + 1. This should appear just once on stderr. +diff -r d33e0cf91556 Doc/howto/logging.rst +--- a/Doc/howto/logging.rst ++++ b/Doc/howto/logging.rst +@@ -106,7 +106,9 @@ + logging.warning('Watch out!') # will print a message to the console + logging.info('I told you so') # will not print anything + +-If you type these lines into a script and run it, you'll see:: ++If you type these lines into a script and run it, you'll see: ++ ++.. code-block:: none + + WARNING:root:Watch out! + +@@ -230,7 +232,9 @@ + import logging + logging.warning('%s before you %s', 'Look', 'leap!') + +-will display:: ++will display: ++ ++.. code-block:: none + + WARNING:root:Look before you leap! + +@@ -585,7 +589,9 @@ + logger.error('error message') + logger.critical('critical message') + +-Running this module from the command line produces the following output:: ++Running this module from the command line produces the following output: ++ ++.. code-block:: shell-session + + $ python simple_logging_module.py + 2005-03-19 15:10:26,618 - simple_example - DEBUG - debug message +@@ -644,7 +650,9 @@ + format=%(asctime)s - %(name)s - %(levelname)s - %(message)s + datefmt= + +-The output is nearly identical to that of the non-config-file-based example:: ++The output is nearly identical to that of the non-config-file-based example: ++ ++.. code-block:: shell-session + + $ python simple_logging_config.py + 2005-03-19 15:38:55,977 - simpleExample - DEBUG - debug message +@@ -1041,4 +1049,3 @@ + Useful handlers included with the logging module. + + :ref:`A logging cookbook ` +- +diff -r d33e0cf91556 Doc/howto/regex.rst +--- a/Doc/howto/regex.rst ++++ b/Doc/howto/regex.rst +@@ -79,7 +79,9 @@ + devoted to discussing various metacharacters and what they do. + + Here's a complete list of the metacharacters; their meanings will be discussed +-in the rest of this HOWTO. :: ++in the rest of this HOWTO. ++ ++.. code-block:: none + + . ^ $ * + ? { } [ ] \ | ( ) + +diff -r d33e0cf91556 Doc/howto/sockets.rst +--- a/Doc/howto/sockets.rst ++++ b/Doc/howto/sockets.rst +@@ -110,7 +110,7 @@ + There's actually 3 general ways in which this loop could work - dispatching a + thread to handle ``clientsocket``, create a new process to handle + ``clientsocket``, or restructure this app to use non-blocking sockets, and +-mulitplex between our "server" socket and any active ``clientsocket``\ s using ++multiplex between our "server" socket and any active ``clientsocket``\ s using + ``select``. More about that later. The important thing to understand now is + this: this is *all* a "server" socket does. It doesn't send any data. It doesn't + receive any data. It just produces "client" sockets. Each ``clientsocket`` is +diff -r d33e0cf91556 Doc/howto/sorting.rst +--- a/Doc/howto/sorting.rst ++++ b/Doc/howto/sorting.rst +@@ -59,28 +59,28 @@ + as keys. For example: + + >>> student_tuples = [ +- ('john', 'A', 15), +- ('jane', 'B', 12), +- ('dave', 'B', 10), +- ] ++ ... ('john', 'A', 15), ++ ... ('jane', 'B', 12), ++ ... ('dave', 'B', 10), ++ ... ] + >>> sorted(student_tuples, key=lambda student: student[2]) # sort by age + [('dave', 'B', 10), ('jane', 'B', 12), ('john', 'A', 15)] + + The same technique works for objects with named attributes. For example: + + >>> class Student: +- def __init__(self, name, grade, age): +- self.name = name +- self.grade = grade +- self.age = age +- def __repr__(self): +- return repr((self.name, self.grade, self.age)) ++ ... def __init__(self, name, grade, age): ++ ... self.name = name ++ ... self.grade = grade ++ ... self.age = age ++ ... def __repr__(self): ++ ... return repr((self.name, self.grade, self.age)) + + >>> student_objects = [ +- Student('john', 'A', 15), +- Student('jane', 'B', 12), +- Student('dave', 'B', 10), +- ] ++ ... Student('john', 'A', 15), ++ ... Student('jane', 'B', 12), ++ ... Student('dave', 'B', 10), ++ ... ] + >>> sorted(student_objects, key=lambda student: student.age) # sort by age + [('dave', 'B', 10), ('jane', 'B', 12), ('john', 'A', 15)] + +@@ -90,7 +90,7 @@ + The key-function patterns shown above are very common, so Python provides + convenience functions to make accessor functions easier and faster. The operator + module has :func:`operator.itemgetter`, :func:`operator.attrgetter`, and +-starting in Python 2.5 a :func:`operator.methodcaller` function. ++starting in Python 2.5 an :func:`operator.methodcaller` function. + + Using those functions, the above examples become simpler and faster: + +@@ -116,6 +116,7 @@ + method could be used to compute message priority by counting the + number of exclamation marks in a message: + ++ >>> from operator import methodcaller + >>> messages = ['critical!!!', 'hurry!', 'standby', 'immediate!!'] + >>> sorted(messages, key=methodcaller('count', '!')) + ['standby', 'hurry!', 'immediate!!', 'critical!!!'] +@@ -220,15 +221,15 @@ + a positive value for greater-than. For example, we can do: + + >>> def numeric_compare(x, y): +- return x - y +- >>> sorted([5, 2, 4, 1, 3], cmp=numeric_compare) ++ ... return x - y ++ >>> sorted([5, 2, 4, 1, 3], cmp=numeric_compare) # doctest: +SKIP + [1, 2, 3, 4, 5] + + Or you can reverse the order of comparison with: + + >>> def reverse_numeric(x, y): +- return y - x +- >>> sorted([5, 2, 4, 1, 3], cmp=reverse_numeric) ++ ... return y - x ++ >>> sorted([5, 2, 4, 1, 3], cmp=reverse_numeric) # doctest: +SKIP + [5, 4, 3, 2, 1] + + When porting code from Python 2.x to 3.x, the situation can arise when you have +@@ -256,6 +257,12 @@ + + To convert to a key function, just wrap the old comparison function: + ++.. testsetup:: ++ ++ from functools import cmp_to_key ++ ++.. doctest:: ++ + >>> sorted([5, 2, 4, 1, 3], key=cmp_to_key(reverse_numeric)) + [5, 4, 3, 2, 1] + +diff -r d33e0cf91556 Doc/howto/unicode.rst +--- a/Doc/howto/unicode.rst ++++ b/Doc/howto/unicode.rst +@@ -619,7 +619,9 @@ + print os.listdir('.') + print os.listdir(u'.') + +-will produce the following output:: ++will produce the following output: ++ ++.. code-block:: shell-session + + amk:~$ python t.py + ['.svn', 'filename\xe4\x94\x80abc', ...] +diff -r d33e0cf91556 Doc/howto/urllib2.rst +--- a/Doc/howto/urllib2.rst ++++ b/Doc/howto/urllib2.rst +@@ -525,6 +525,11 @@ + through a proxy. However, this can be enabled by extending urllib2 as + shown in the recipe [#]_. + ++.. note:: ++ ++ ``HTTP_PROXY`` will be ignored if a variable ``REQUEST_METHOD`` is set; see ++ the documentation on :func:`~urllib.getproxies`. ++ + + Sockets and Layers + ================== +diff -r d33e0cf91556 Doc/library/2to3.rst +--- a/Doc/library/2to3.rst ++++ b/Doc/library/2to3.rst +@@ -33,14 +33,18 @@ + name = raw_input() + greet(name) + +-It can be converted to Python 3.x code via 2to3 on the command line:: ++It can be converted to Python 3.x code via 2to3 on the command line: ++ ++.. code-block:: shell-session + + $ 2to3 example.py + + A diff against the original source file is printed. 2to3 can also write the + needed modifications right back to the source file. (A backup of the original + file is made unless :option:`-n` is also given.) Writing the changes back is +-enabled with the :option:`-w` flag:: ++enabled with the :option:`-w` flag: ++ ++.. code-block:: shell-session + + $ 2to3 -w example.py + +@@ -57,17 +61,23 @@ + By default, 2to3 runs a set of :ref:`predefined fixers <2to3-fixers>`. The + :option:`-l` flag lists all available fixers. An explicit set of fixers to run + can be given with :option:`-f`. Likewise the :option:`!-x` explicitly disables a +-fixer. The following example runs only the ``imports`` and ``has_key`` fixers:: ++fixer. The following example runs only the ``imports`` and ``has_key`` fixers: ++ ++.. code-block:: shell-session + + $ 2to3 -f imports -f has_key example.py + +-This command runs every fixer except the ``apply`` fixer:: ++This command runs every fixer except the ``apply`` fixer: ++ ++.. code-block:: shell-session + + $ 2to3 -x apply example.py + + Some fixers are *explicit*, meaning they aren't run by default and must be + listed on the command line to be run. Here, in addition to the default fixers, +-the ``idioms`` fixer is run:: ++the ``idioms`` fixer is run: ++ ++.. code-block:: shell-session + + $ 2to3 -f all -f idioms example.py + +@@ -113,7 +123,9 @@ + + The :option:`--add-suffix` option specifies a string to append to all output + filenames. The :option:`-n` flag is required when specifying this as backups +-are not necessary when writing to different filenames. Example:: ++are not necessary when writing to different filenames. Example: ++ ++.. code-block:: shell-session + + $ 2to3 -n -W --add-suffix=3 example.py + +@@ -122,7 +134,9 @@ + .. versionadded:: 2.7.3 + The :option:`--add-suffix` option was added. + +-To translate an entire project from one directory tree to another use:: ++To translate an entire project from one directory tree to another use: ++ ++.. code-block:: shell-session + + $ 2to3 --output-dir=python3-version/mycode -W -n python2-version/mycode + +diff -r d33e0cf91556 Doc/library/__builtin__.rst +--- a/Doc/library/__builtin__.rst ++++ b/Doc/library/__builtin__.rst +@@ -39,6 +39,6 @@ + + Most modules have the name ``__builtins__`` (note the ``'s'``) made available + as part of their globals. The value of ``__builtins__`` is normally either +- this module or the value of this modules's :attr:`__dict__` attribute. Since ++ this module or the value of this modules's :attr:`~object.__dict__` attribute. Since + this is an implementation detail, it may not be used by alternate + implementations of Python. +diff -r d33e0cf91556 Doc/library/aetypes.rst +--- a/Doc/library/aetypes.rst ++++ b/Doc/library/aetypes.rst +@@ -19,7 +19,7 @@ + classes. Packing and unpacking instances of these classes is handled + automatically by :mod:`aepack`. + +-An object specifier is essentially an address of an object implemented in a ++An object specifier is essentially an address of an object implemented in an + Apple Event server. An Apple Event specifier is used as the direct object for an + Apple Event or as the argument of an optional parameter. The :mod:`aetypes` + module contains the base classes for OSA classes and properties, which are used +diff -r d33e0cf91556 Doc/library/argparse.rst +--- a/Doc/library/argparse.rst ++++ b/Doc/library/argparse.rst +@@ -44,7 +44,9 @@ + print args.accumulate(args.integers) + + Assuming the Python code above is saved into a file called ``prog.py``, it can +-be run at the command line and provides useful help messages:: ++be run at the command line and provides useful help messages: ++ ++.. code-block:: shell-session + + $ python prog.py -h + usage: prog.py [-h] [--sum] N [N ...] +@@ -59,7 +61,9 @@ + --sum sum the integers (default: find the max) + + When run with the appropriate arguments, it prints either the sum or the max of +-the command-line integers:: ++the command-line integers: ++ ++.. code-block:: shell-session + + $ python prog.py 1 2 3 4 + 4 +@@ -67,7 +71,9 @@ + $ python prog.py 1 2 3 4 --sum + 10 + +-If invalid arguments are passed in, it will issue an error:: ++If invalid arguments are passed in, it will issue an error: ++ ++.. code-block:: shell-session + + $ python prog.py a b c + usage: prog.py [-h] [--sum] N [N ...] +@@ -187,7 +193,9 @@ + args = parser.parse_args() + + The help for this program will display ``myprogram.py`` as the program name +-(regardless of where the program was invoked from):: ++(regardless of where the program was invoked from): ++ ++.. code-block:: shell-session + + $ python myprogram.py --help + usage: myprogram.py [-h] [--foo FOO] +@@ -550,7 +558,9 @@ + args = parser.parse_args() + + If ``-h`` or ``--help`` is supplied at the command line, the ArgumentParser +-help will be printed:: ++help will be printed: ++ ++.. code-block:: shell-session + + $ python myprogram.py --help + usage: myprogram.py [-h] [--foo FOO] +diff -r d33e0cf91556 Doc/library/ast.rst +--- a/Doc/library/ast.rst ++++ b/Doc/library/ast.rst +@@ -113,6 +113,7 @@ + The abstract grammar is currently defined as follows: + + .. literalinclude:: ../../Parser/Python.asdl ++ :language: none + + + :mod:`ast` Helpers +diff -r d33e0cf91556 Doc/library/cgi.rst +--- a/Doc/library/cgi.rst ++++ b/Doc/library/cgi.rst +@@ -450,7 +450,9 @@ + invoked as a script, the file will dump its environment and the contents of the + form in HTML form. Give it the right mode etc, and send it a request. If it's + installed in the standard :file:`cgi-bin` directory, it should be possible to +-send it a request by entering a URL into your browser of the form:: ++send it a request by entering a URL into your browser of the form: ++ ++.. code-block:: none + + http://yourhostname/cgi-bin/cgi.py?name=Joe+Blow&addr=At+Home + +@@ -542,4 +544,3 @@ + field values should be supplied in, but knowing whether a request was + received from a conforming browser, or even from a browser at all, is tedious + and error-prone. +- +diff -r d33e0cf91556 Doc/library/chunk.rst +--- a/Doc/library/chunk.rst ++++ b/Doc/library/chunk.rst +@@ -48,7 +48,7 @@ + the :class:`Chunk` class defined here is to instantiate an instance at the start + of each chunk and read from the instance until it reaches the end, after which a + new instance can be instantiated. At the end of the file, creating a new +-instance will fail with a :exc:`EOFError` exception. ++instance will fail with an :exc:`EOFError` exception. + + + .. class:: Chunk(file[, align, bigendian, inclheader]) +diff -r d33e0cf91556 Doc/library/collections.rst +--- a/Doc/library/collections.rst ++++ b/Doc/library/collections.rst +@@ -608,7 +608,7 @@ + _fields = ('x', 'y') + + def __new__(_cls, x, y): +- 'Create a new instance of Point(x, y)' ++ 'Create new instance of Point(x, y)' + return _tuple.__new__(_cls, (x, y)) + + @classmethod +@@ -635,7 +635,7 @@ + return result + + def __getnewargs__(self): +- 'Return self as a plain tuple. Used by copy and pickle.' ++ 'Return self as a plain tuple. Used by copy and pickle.' + return tuple(self) + + __dict__ = _property(_asdict) +@@ -648,6 +648,7 @@ + + y = _property(_itemgetter(1), doc='Alias for field number 1') + ++ + + >>> p = Point(11, y=22) # instantiate with positional or keyword arguments + >>> p[0] + p[1] # indexable like the plain tuple (11, 22) +@@ -712,7 +713,7 @@ + Point(x=33, y=22) + + >>> for partnum, record in inventory.items(): +- inventory[partnum] = record._replace(price=newprices[partnum], timestamp=time.now()) ++ ... inventory[partnum] = record._replace(price=newprices[partnum], timestamp=time.now()) + + .. attribute:: somenamedtuple._fields + +@@ -747,15 +748,15 @@ + a fixed-width print format: + + >>> class Point(namedtuple('Point', 'x y')): +- __slots__ = () +- @property +- def hypot(self): +- return (self.x ** 2 + self.y ** 2) ** 0.5 +- def __str__(self): +- return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) +- ++ ... __slots__ = () ++ ... @property ++ ... def hypot(self): ++ ... return (self.x ** 2 + self.y ** 2) ** 0.5 ++ ... def __str__(self): ++ ... return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) ++ ... + >>> for p in Point(3, 4), Point(14, 5/7.): +- print p ++ ... print p + Point: x= 3.000 y= 4.000 hypot= 5.000 + Point: x=14.000 y= 0.714 hypot=14.018 + +@@ -781,7 +782,7 @@ + >>> Status.open, Status.pending, Status.closed + (0, 1, 2) + >>> class Status: +- open, pending, closed = range(3) ++ ... open, pending, closed = range(3) + + .. seealso:: + +diff -r d33e0cf91556 Doc/library/copy.rst +--- a/Doc/library/copy.rst ++++ b/Doc/library/copy.rst +@@ -44,7 +44,7 @@ + reference to themselves) may cause a recursive loop. + + * Because deep copy copies *everything* it may copy too much, e.g., +- administrative data structures that should be shared even between copies. ++ even administrative data structures that should be shared even between copies. + + The :func:`deepcopy` function avoids these problems by: + +diff -r d33e0cf91556 Doc/library/curses.ascii.rst +--- a/Doc/library/curses.ascii.rst ++++ b/Doc/library/curses.ascii.rst +@@ -116,12 +116,12 @@ + + .. function:: isblank(c) + +- Checks for an ASCII whitespace character. ++ Checks for an ASCII whitespace character; space or horizontal tab. + + + .. function:: iscntrl(c) + +- Checks for an ASCII control character (in the range 0x00 to 0x1f). ++ Checks for an ASCII control character (in the range 0x00 to 0x1f or 0x7f). + + + .. function:: isdigit(c) +diff -r d33e0cf91556 Doc/library/decimal.rst +--- a/Doc/library/decimal.rst ++++ b/Doc/library/decimal.rst +@@ -883,11 +883,13 @@ + + .. method:: to_eng_string([context]) + +- Convert to an engineering-type string. +- +- Engineering notation has an exponent which is a multiple of 3, so there +- are up to 3 digits left of the decimal place. For example, converts +- ``Decimal('123E+1')`` to ``Decimal('1.23E+3')``. ++ Convert to a string, using engineering notation if an exponent is needed. ++ ++ Engineering notation has an exponent which is a multiple of 3. This ++ can leave up to 3 digits to the left of the decimal place and may ++ require the addition of either one or two trailing zeros. ++ ++ For example, this converts ``Decimal('123E+1')`` to ``Decimal('1.23E+3')``. + + .. method:: to_integral([rounding[, context]]) + +@@ -1453,7 +1455,11 @@ + + .. method:: to_eng_string(x) + +- Converts a number to a string, using scientific notation. ++ Convert to a string, using engineering notation if an exponent is needed. ++ ++ Engineering notation has an exponent which is a multiple of 3. This ++ can leave up to 3 digits to the left of the decimal place and may ++ require the addition of either one or two trailing zeros. + + + .. method:: to_integral_exact(x) +diff -r d33e0cf91556 Doc/library/difflib.rst +--- a/Doc/library/difflib.rst ++++ b/Doc/library/difflib.rst +@@ -276,7 +276,7 @@ + generating the delta lines) in unified diff format. + + Unified diffs are a compact way of showing just the lines that have changed plus +- a few lines of context. The changes are shown in a inline style (instead of ++ a few lines of context. The changes are shown in an inline style (instead of + separate before/after blocks). The number of context lines is set by *n* which + defaults to three. + +diff -r d33e0cf91556 Doc/library/doctest.rst +--- a/Doc/library/doctest.rst ++++ b/Doc/library/doctest.rst +@@ -91,14 +91,18 @@ + doctest.testmod() + + If you run :file:`example.py` directly from the command line, :mod:`doctest` +-works its magic:: ++works its magic: ++ ++.. code-block:: shell-session + + $ python example.py + $ + + There's no output! That's normal, and it means all the examples worked. Pass + ``-v`` to the script, and :mod:`doctest` prints a detailed log of what +-it's trying, and prints a summary at the end:: ++it's trying, and prints a summary at the end: ++ ++.. code-block:: shell-session + + $ python example.py -v + Trying: +@@ -117,7 +121,9 @@ + [1, 1, 2, 6, 24, 120] + ok + +-And so on, eventually ending with:: ++And so on, eventually ending with: ++ ++.. code-block:: none + + Trying: + factorial(1e100) +@@ -205,7 +211,9 @@ + That short script executes and verifies any interactive Python examples + contained in the file :file:`example.txt`. The file content is treated as if it + were a single giant docstring; the file doesn't need to contain a Python +-program! For example, perhaps :file:`example.txt` contains this:: ++program! For example, perhaps :file:`example.txt` contains this: ++ ++.. code-block:: none + + The ``example`` module + ====================== +diff -r d33e0cf91556 Doc/library/ftplib.rst +--- a/Doc/library/ftplib.rst ++++ b/Doc/library/ftplib.rst +@@ -283,9 +283,9 @@ + + .. method:: FTP.transfercmd(cmd[, rest]) + +- Initiate a transfer over the data connection. If the transfer is active, send a ++ Initiate a transfer over the data connection. If the transfer is active, send an + ``EPRT`` or ``PORT`` command and the transfer command specified by *cmd*, and +- accept the connection. If the server is passive, send a ``EPSV`` or ``PASV`` ++ accept the connection. If the server is passive, send an ``EPSV`` or ``PASV`` + command, connect to it, and start the transfer command. Either way, return the + socket for the connection. + +diff -r d33e0cf91556 Doc/library/functions.rst +--- a/Doc/library/functions.rst ++++ b/Doc/library/functions.rst +@@ -311,7 +311,7 @@ + :func:`dir` reports their attributes. + + If the object does not provide :meth:`__dir__`, the function tries its best to +- gather information from the object's :attr:`__dict__` attribute, if defined, and ++ gather information from the object's :attr:`~object.__dict__` attribute, if defined, and + from its type object. The resulting list is not necessarily complete, and may + be inaccurate when the object has a custom :func:`__getattr__`. + +@@ -1477,7 +1477,7 @@ + + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the +- class name and becomes the :attr:`~class.__name__` attribute; the *bases* tuple ++ class name and becomes the :attr:`~definition.__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`~class.__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`~object.__dict__` attribute. For example, the +@@ -1545,11 +1545,11 @@ + .. function:: vars([object]) + + Return the :attr:`~object.__dict__` attribute for a module, class, instance, +- or any other object with a :attr:`__dict__` attribute. ++ or any other object with a :attr:`~object.__dict__` attribute. + +- Objects such as modules and instances have an updateable :attr:`__dict__` ++ Objects such as modules and instances have an updateable :attr:`~object.__dict__` + attribute; however, other objects may have write restrictions on their +- :attr:`__dict__` attributes (for example, new-style classes use a ++ :attr:`~object.__dict__` attributes (for example, new-style classes use a + dictproxy to prevent direct dictionary updates). + + Without an argument, :func:`vars` acts like :func:`locals`. Note, the +diff -r d33e0cf91556 Doc/library/functools.rst +--- a/Doc/library/functools.rst ++++ b/Doc/library/functools.rst +@@ -185,7 +185,7 @@ + + :class:`partial` objects are like :class:`function` objects in that they are + callable, weak referencable, and can have attributes. There are some important +-differences. For instance, the :attr:`__name__` and :attr:`__doc__` attributes ++differences. For instance, the :attr:`~definition.__name__` and :attr:`__doc__` attributes + are not created automatically. Also, :class:`partial` objects defined in + classes behave like static methods and do not transform into bound methods + during instance attribute look-up. +diff -r d33e0cf91556 Doc/library/htmlparser.rst +--- a/Doc/library/htmlparser.rst ++++ b/Doc/library/htmlparser.rst +@@ -78,7 +78,9 @@ + parser.feed('Test' + '

Parse me!

') + +-The output will then be:: ++The output will then be: ++ ++.. code-block:: none + + Encountered a start tag: html + Encountered a start tag: head +diff -r d33e0cf91556 Doc/library/idle.rst +--- a/Doc/library/idle.rst ++++ b/Doc/library/idle.rst +@@ -520,14 +520,14 @@ + Command line usage + ^^^^^^^^^^^^^^^^^^ + +-:: ++.. code-block:: none + + idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ... + + -c command run command in the shell window + -d enable debugger and open shell window + -e open editor window +- -h print help message with legal combinatios and exit ++ -h print help message with legal combinations and exit + -i open shell window + -r file run file in shell window + -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window +@@ -562,7 +562,9 @@ + ``print`` will not work correctly. + + With IDLE's Shell, one enters, edits, and recalls complete statements. +-Some consoles only work with a single physical line at a time. ++Some consoles only work with a single physical line at a time. IDLE uses ++``exec`` to run each statement. As a result, ``'__builtins__'`` is always ++defined for each statement. + + Running without a subprocess + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +diff -r d33e0cf91556 Doc/library/inspect.rst +--- a/Doc/library/inspect.rst ++++ b/Doc/library/inspect.rst +@@ -335,9 +335,11 @@ + are true. + + This is new as of Python 2.2, and, for example, is true of +- ``int.__add__``. An object passing this test has a :attr:`__get__` attribute +- but not a :attr:`__set__` attribute, but beyond that the set of attributes +- varies. :attr:`__name__` is usually sensible, and :attr:`__doc__` often is. ++ ``int.__add__``. An object passing this test ++ has a :meth:`~object.__get__` method but not a :meth:`~object.__set__` ++ method, but beyond that the set of attributes varies. A ++ :attr:`~definition.__name__` attribute is usually ++ sensible, and :attr:`__doc__` often is. + + Methods implemented via descriptors that also pass one of the other tests + return false from the :func:`ismethoddescriptor` test, simply because the +@@ -349,11 +351,11 @@ + + Return true if the object is a data descriptor. + +- Data descriptors have both a :attr:`__get__` and a :attr:`__set__` attribute. ++ Data descriptors have both a :attr:`~object.__get__` and a :attr:`~object.__set__` method. + Examples are properties (defined in Python), getsets, and members. The + latter two are defined in C and there are more specific tests available for + those types, which is robust across Python implementations. Typically, data +- descriptors will also have :attr:`__name__` and :attr:`__doc__` attributes ++ descriptors will also have :attr:`~definition.__name__` and :attr:`__doc__` attributes + (properties, getsets, and members have both of these attributes), but this is + not guaranteed. + +diff -r d33e0cf91556 Doc/library/io.rst +--- a/Doc/library/io.rst ++++ b/Doc/library/io.rst +@@ -221,7 +221,7 @@ + Even though :class:`IOBase` does not declare :meth:`read`, :meth:`readinto`, + or :meth:`write` because their signatures will vary, implementations and + clients should consider those methods part of the interface. Also, +- implementations may raise a :exc:`IOError` when operations they do not ++ implementations may raise an :exc:`IOError` when operations they do not + support are called. + + The basic type used for binary data read from or written to a file is +diff -r d33e0cf91556 Doc/library/json.rst +--- a/Doc/library/json.rst ++++ b/Doc/library/json.rst +@@ -99,9 +99,9 @@ + + .. highlight:: none + +-Using json.tool from the shell to validate and pretty-print:: ++Using :mod:`json.tool` from the shell to validate and pretty-print:: + +- $ echo '{"json":"obj"}' | python -mjson.tool ++ $ echo '{"json":"obj"}' | python -m json.tool + { + "json": "obj" + } +@@ -130,28 +130,29 @@ + :term:`file-like object`) using this :ref:`conversion table + `. + +- If *skipkeys* is ``True`` (default: ``False``), then dict keys that are not ++ If *skipkeys* is true (default: ``False``), then dict keys that are not + of a basic type (:class:`str`, :class:`unicode`, :class:`int`, :class:`long`, + :class:`float`, :class:`bool`, ``None``) will be skipped instead of raising a + :exc:`TypeError`. + +- If *ensure_ascii* is ``True`` (the default), all non-ASCII characters in the ++ If *ensure_ascii* is true (the default), all non-ASCII characters in the + output are escaped with ``\uXXXX`` sequences, and the result is a + :class:`str` instance consisting of ASCII characters only. If +- *ensure_ascii* is ``False``, some chunks written to *fp* may be ++ *ensure_ascii* is false, some chunks written to *fp* may be + :class:`unicode` instances. This usually happens because the input contains + unicode strings or the *encoding* parameter is used. Unless ``fp.write()`` + explicitly understands :class:`unicode` (as in :func:`codecs.getwriter`) + this is likely to cause an error. + +- If *check_circular* is ``False`` (default: ``True``), then the circular ++ If *check_circular* is false (default: ``True``), then the circular + reference check for container types will be skipped and a circular reference + will result in an :exc:`OverflowError` (or worse). + +- If *allow_nan* is ``False`` (default: ``True``), then it will be a ++ If *allow_nan* is false (default: ``True``), then it will be a + :exc:`ValueError` to serialize out of range :class:`float` values (``nan``, +- ``inf``, ``-inf``) in strict compliance of the JSON specification, instead of +- using the JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``). ++ ``inf``, ``-inf``) in strict compliance of the JSON specification. ++ If *allow_nan* is true, their JavaScript equivalents (``NaN``, ++ ``Infinity``, ``-Infinity``) will be used. + + If *indent* is a non-negative integer, then JSON array elements and object + members will be pretty-printed with that indent level. An indent level of 0, +@@ -164,16 +165,18 @@ + trailing whitespace when *indent* is specified. You can use + ``separators=(',', ': ')`` to avoid this. + +- If *separators* is an ``(item_separator, dict_separator)`` tuple, then it +- will be used instead of the default ``(', ', ': ')`` separators. ``(',', +- ':')`` is the most compact JSON representation. ++ If specified, *separators* should be an ``(item_separator, key_separator)`` ++ tuple. By default, ``(', ', ': ')`` are used. To get the most compact JSON ++ representation, you should specify ``(',', ':')`` to eliminate whitespace. + + *encoding* is the character encoding for str instances, default is UTF-8. + +- *default(obj)* is a function that should return a serializable version of +- *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. ++ If specified, *default* should be a function that gets called for objects that ++ can't otherwise be serialized. It should return a JSON encodable version of ++ the object or raise a :exc:`TypeError`. If not specified, :exc:`TypeError` ++ is raised. + +- If *sort_keys* is ``True`` (default: ``False``), then the output of ++ If *sort_keys* is true (default: ``False``), then the output of + dictionaries will be sorted by key. + + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the +@@ -192,7 +195,7 @@ + default=None, sort_keys=False, **kw) + + Serialize *obj* to a JSON formatted :class:`str` using this :ref:`conversion +- table `. If *ensure_ascii* is ``False``, the result may ++ table `. If *ensure_ascii* is false, the result may + contain non-ASCII characters and the return value may be a :class:`unicode` + instance. + +@@ -345,7 +348,7 @@ + ``'false'``. This can be used to raise an exception if invalid JSON numbers + are encountered. + +- If *strict* is ``False`` (``True`` is the default), then control characters ++ If *strict* is false (``True`` is the default), then control characters + will be allowed inside strings. Control characters in this context are + those with character codes in the 0-31 range, including ``'\t'`` (tab), + ``'\n'``, ``'\r'`` and ``'\0'``. +@@ -399,29 +402,29 @@ + for ``o`` if possible, otherwise it should call the superclass implementation + (to raise :exc:`TypeError`). + +- If *skipkeys* is ``False`` (the default), then it is a :exc:`TypeError` to ++ If *skipkeys* is false (the default), then it is a :exc:`TypeError` to + attempt encoding of keys that are not str, int, long, float or None. If +- *skipkeys* is ``True``, such items are simply skipped. ++ *skipkeys* is true, such items are simply skipped. + +- If *ensure_ascii* is ``True`` (the default), all non-ASCII characters in the ++ If *ensure_ascii* is true (the default), all non-ASCII characters in the + output are escaped with ``\uXXXX`` sequences, and the results are + :class:`str` instances consisting of ASCII characters only. If +- *ensure_ascii* is ``False``, a result may be a :class:`unicode` ++ *ensure_ascii* is false, a result may be a :class:`unicode` + instance. This usually happens if the input contains unicode strings or the + *encoding* parameter is used. + +- If *check_circular* is ``True`` (the default), then lists, dicts, and custom ++ If *check_circular* is true (the default), then lists, dicts, and custom + encoded objects will be checked for circular references during encoding to + prevent an infinite recursion (which would cause an :exc:`OverflowError`). + Otherwise, no such check takes place. + +- If *allow_nan* is ``True`` (the default), then ``NaN``, ``Infinity``, and ++ If *allow_nan* is true (the default), then ``NaN``, ``Infinity``, and + ``-Infinity`` will be encoded as such. This behavior is not JSON + specification compliant, but is consistent with most JavaScript based + encoders and decoders. Otherwise, it will be a :exc:`ValueError` to encode + such floats. + +- If *sort_keys* is ``True`` (default ``False``), then the output of dictionaries ++ If *sort_keys* is true (default: ``False``), then the output of dictionaries + will be sorted by key; this is useful for regression tests to ensure that + JSON serializations can be compared on a day-to-day basis. + +@@ -437,12 +440,13 @@ + ``separators=(',', ': ')`` to avoid this. + + If specified, *separators* should be an ``(item_separator, key_separator)`` +- tuple. The default is ``(', ', ': ')``. To get the most compact JSON ++ tuple. By default, ``(', ', ': ')`` are used. To get the most compact JSON + representation, you should specify ``(',', ':')`` to eliminate whitespace. + +- If specified, *default* is a function that gets called for objects that can't +- otherwise be serialized. It should return a JSON encodable version of the +- object or raise a :exc:`TypeError`. ++ If specified, *default* should be a function that gets called for objects that ++ can't otherwise be serialized. It should return a JSON encodable version of ++ the object or raise a :exc:`TypeError`. If not specified, :exc:`TypeError` ++ is raised. + + If *encoding* is not ``None``, then all input strings will be transformed + into unicode using that encoding prior to JSON-encoding. The default is +diff -r d33e0cf91556 Doc/library/logging.config.rst +--- a/Doc/library/logging.config.rst ++++ b/Doc/library/logging.config.rst +@@ -209,7 +209,9 @@ + handler. + + All *other* keys are passed through as keyword arguments to the +- handler's constructor. For example, given the snippet:: ++ handler's constructor. For example, given the snippet: ++ ++ .. code-block:: yaml + + handlers: + console: +@@ -318,7 +320,9 @@ + configuration to indicate that a connection exists between the source + and the destination object with that id. + +-So, for example, consider the following YAML snippet:: ++So, for example, consider the following YAML snippet: ++ ++.. code-block:: yaml + + formatters: + brief: +@@ -375,7 +379,9 @@ + configuration dictionary and which returns the instantiated object. + This is signalled by an absolute import path to the factory being + made available under the special key ``'()'``. Here's a concrete +-example:: ++example: ++ ++.. code-block:: yaml + + formatters: + brief: +@@ -592,7 +598,9 @@ + :func:`dictConfig`, so it's worth considering transitioning to this newer + API when it's convenient to do so. + +-Examples of these sections in the file are given below. :: ++Examples of these sections in the file are given below. ++ ++.. code-block:: ini + + [loggers] + keys=root,log02,log03,log04,log05,log06,log07 +@@ -604,7 +612,9 @@ + keys=form01,form02,form03,form04,form05,form06,form07,form08,form09 + + The root logger must specify a level and a list of handlers. An example of a +-root logger section is given below. :: ++root logger section is given below. ++ ++.. code-block:: ini + + [logger_root] + level=NOTSET +@@ -621,7 +631,9 @@ + file. + + For loggers other than the root logger, some additional information is required. +-This is illustrated by the following example. :: ++This is illustrated by the following example. ++ ++.. code-block:: ini + + [logger_parser] + level=DEBUG +@@ -639,7 +651,8 @@ + say the name used by the application to get the logger. + + Sections which specify handler configuration are exemplified by the following. +-:: ++ ++.. code-block:: ini + + [handler_hand01] + class=StreamHandler +@@ -663,7 +676,9 @@ + The ``args`` entry, when :func:`eval`\ uated in the context of the ``logging`` + package's namespace, is the list of arguments to the constructor for the handler + class. Refer to the constructors for the relevant handlers, or to the examples +-below, to see how typical entries are constructed. :: ++below, to see how typical entries are constructed. ++ ++.. code-block:: ini + + [handler_hand02] + class=FileHandler +@@ -714,7 +729,9 @@ + formatter=form09 + args=('localhost:9022', '/log', 'GET') + +-Sections which specify formatter configuration are typified by the following. :: ++Sections which specify formatter configuration are typified by the following. ++ ++.. code-block:: ini + + [formatter_form01] + format=F1 %(asctime)s %(levelname)s %(message)s +@@ -750,5 +767,3 @@ + + Module :mod:`logging.handlers` + Useful handlers included with the logging module. +- +- +diff -r d33e0cf91556 Doc/library/optparse.rst +--- a/Doc/library/optparse.rst ++++ b/Doc/library/optparse.rst +@@ -680,7 +680,9 @@ + this option on the command line, it expands your ``version`` string (by + replacing ``%prog``), prints it to stdout, and exits. + +-For example, if your script is called ``/usr/bin/foo``:: ++For example, if your script is called ``/usr/bin/foo``: ++ ++.. code-block:: shell-session + + $ /usr/bin/foo --version + foo 1.0 +@@ -730,14 +732,18 @@ + error status 2. + + Consider the first example above, where the user passes ``4x`` to an option +-that takes an integer:: ++that takes an integer: ++ ++.. code-block:: shell-session + + $ /usr/bin/foo -n 4x + Usage: foo [options] + + foo: error: option -n: invalid integer value: '4x' + +-Or, where the user fails to pass a value at all:: ++Or, where the user fails to pass a value at all: ++ ++.. code-block:: shell-session + + $ /usr/bin/foo -n + Usage: foo [options] +@@ -1327,7 +1333,7 @@ + the list of arguments to process (default: ``sys.argv[1:]``) + + ``values`` +- a :class:`optparse.Values` object to store option arguments in (default: a ++ an :class:`optparse.Values` object to store option arguments in (default: a + new instance of :class:`Values`) -- if you give an existing object, the + option defaults will not be initialized on it + +diff -r d33e0cf91556 Doc/library/os.path.rst +--- a/Doc/library/os.path.rst ++++ b/Doc/library/os.path.rst +@@ -256,7 +256,7 @@ + .. function:: samefile(path1, path2) + + Return ``True`` if both pathname arguments refer to the same file or directory +- (as indicated by device number and i-node number). Raise an exception if a ++ (as indicated by device number and i-node number). Raise an exception if an + :func:`os.stat` call on either pathname fails. + + Availability: Unix. +diff -r d33e0cf91556 Doc/library/py_compile.rst +--- a/Doc/library/py_compile.rst ++++ b/Doc/library/py_compile.rst +@@ -29,7 +29,7 @@ + .. function:: compile(file[, cfile[, dfile[, doraise]]]) + + Compile a source file to byte-code and write out the byte-code cache file. The +- source code is loaded from the file name *file*. The byte-code is written to ++ source code is loaded from the file named *file*. The byte-code is written to + *cfile*, which defaults to *file* ``+`` ``'c'`` (``'o'`` if optimization is + enabled in the current interpreter). If *dfile* is specified, it is used as the + name of the source file in error messages instead of *file*. If *doraise* is +diff -r d33e0cf91556 Doc/library/pyexpat.rst +--- a/Doc/library/pyexpat.rst ++++ b/Doc/library/pyexpat.rst +@@ -87,7 +87,9 @@ + separator. + + For example, if *namespace_separator* is set to a space character (``' '``) and +- the following document is parsed:: ++ the following document is parsed: ++ ++ .. code-block:: xml + + + >> make_archive(archive_name, 'gztar', root_dir) + '/Users/tarek/myarchive.tar.gz' + +-The resulting archive contains:: ++The resulting archive contains: ++ ++.. code-block:: shell-session + + $ tar -tzvf /Users/tarek/myarchive.tar.gz + drwx------ tarek/staff 0 2010-02-01 16:23:40 ./ +diff -r d33e0cf91556 Doc/library/simplexmlrpcserver.rst +--- a/Doc/library/simplexmlrpcserver.rst ++++ b/Doc/library/simplexmlrpcserver.rst +@@ -273,7 +273,7 @@ + + .. method:: CGIXMLRPCRequestHandler.handle_request([request_text = None]) + +- Handle a XML-RPC request. If *request_text* is given, it should be the POST ++ Handle an XML-RPC request. If *request_text* is given, it should be the POST + data provided by the HTTP server, otherwise the contents of stdin will be used. + + Example:: +diff -r d33e0cf91556 Doc/library/smtplib.rst +--- a/Doc/library/smtplib.rst ++++ b/Doc/library/smtplib.rst +@@ -22,7 +22,7 @@ + + .. class:: SMTP([host[, port[, local_hostname[, timeout]]]]) + +- A :class:`SMTP` instance encapsulates an SMTP connection. It has methods ++ An :class:`SMTP` instance encapsulates an SMTP connection. It has methods + that support a full repertoire of SMTP and ESMTP operations. If the optional + host and port parameters are given, the SMTP :meth:`connect` method is + called with those parameters during initialization. If specified, +@@ -45,7 +45,7 @@ + + .. class:: SMTP_SSL([host[, port[, local_hostname[, keyfile[, certfile[, timeout]]]]]]) + +- A :class:`SMTP_SSL` instance behaves exactly the same as instances of ++ An :class:`SMTP_SSL` instance behaves exactly the same as instances of + :class:`SMTP`. :class:`SMTP_SSL` should be used for situations where SSL is + required from the beginning of the connection and using :meth:`starttls` is + not appropriate. If *host* is not specified, the local host is used. If +diff -r d33e0cf91556 Doc/library/socket.rst +--- a/Doc/library/socket.rst ++++ b/Doc/library/socket.rst +@@ -757,7 +757,7 @@ + Set blocking or non-blocking mode of the socket: if *flag* is 0, the socket is + set to non-blocking, else to blocking mode. Initially all sockets are in + blocking mode. In non-blocking mode, if a :meth:`recv` call doesn't find any +- data, or if a :meth:`send` call can't immediately dispose of the data, a ++ data, or if a :meth:`send` call can't immediately dispose of the data, an + :exc:`error` exception is raised; in blocking mode, the calls block until they + can proceed. ``s.setblocking(0)`` is equivalent to ``s.settimeout(0.0)``; + ``s.setblocking(1)`` is equivalent to ``s.settimeout(None)``. +diff -r d33e0cf91556 Doc/library/socketserver.rst +--- a/Doc/library/socketserver.rst ++++ b/Doc/library/socketserver.rst +@@ -481,7 +481,9 @@ + + The output of the example should look something like this: + +-Server:: ++Server: ++ ++.. code-block:: shell-session + + $ python TCPServer.py + 127.0.0.1 wrote: +@@ -489,7 +491,9 @@ + 127.0.0.1 wrote: + python is nice + +-Client:: ++Client: ++ ++.. code-block:: shell-session + + $ python TCPClient.py hello world with TCP + Sent: hello world with TCP +@@ -604,7 +608,9 @@ + server.server_close() + + +-The output of the example should look something like this:: ++The output of the example should look something like this: ++ ++.. code-block:: shell-session + + $ python ThreadedTCPServer.py + Server loop running in thread: Thread-1 +diff -r d33e0cf91556 Doc/library/sqlite3.rst +--- a/Doc/library/sqlite3.rst ++++ b/Doc/library/sqlite3.rst +@@ -256,11 +256,11 @@ + :ref:`sqlite3-controlling-transactions` for a more detailed explanation. + + +- .. method:: cursor([cursorClass]) ++ .. method:: cursor(factory=Cursor) + +- The cursor method accepts a single optional parameter *cursorClass*. If +- supplied, this must be a custom cursor class that extends +- :class:`sqlite3.Cursor`. ++ The cursor method accepts a single optional parameter *factory*. If ++ supplied, this must be a callable returning an instance of :class:`Cursor` ++ or its subclasses. + + .. method:: commit() + +@@ -583,7 +583,7 @@ + .. attribute:: lastrowid + + This read-only attribute provides the rowid of the last modified row. It is +- only set if you issued a ``INSERT`` statement using the :meth:`execute` ++ only set if you issued an ``INSERT`` statement using the :meth:`execute` + method. For operations other than ``INSERT`` or when :meth:`executemany` is + called, :attr:`lastrowid` is set to :const:`None`. + +diff -r d33e0cf91556 Doc/library/stdtypes.rst +--- a/Doc/library/stdtypes.rst ++++ b/Doc/library/stdtypes.rst +@@ -1217,13 +1217,68 @@ + Line breaks are not included in the resulting list unless *keepends* is + given and true. + +- For example, ``'ab c\n\nde fg\rkl\r\n'.splitlines()`` returns +- ``['ab c', '', 'de fg', 'kl']``, while the same call with ``splitlines(True)`` +- returns ``['ab c\n', '\n', 'de fg\r', 'kl\r\n']``. ++ Python recognizes ``"\r"``, ``"\n"``, and ``"\r\n"`` as line boundaries for ++ 8-bit strings. ++ ++ For example:: ++ ++ >>> 'ab c\n\nde fg\rkl\r\n'.splitlines() ++ ['ab c', '', 'de fg', 'kl'] ++ >>> 'ab c\n\nde fg\rkl\r\n'.splitlines(True) ++ ['ab c\n', '\n', 'de fg\r', 'kl\r\n'] + + Unlike :meth:`~str.split` when a delimiter string *sep* is given, this + method returns an empty list for the empty string, and a terminal line +- break does not result in an extra line. ++ break does not result in an extra line:: ++ ++ >>> "".splitlines() ++ [] ++ >>> "One line\n".splitlines() ++ ['One line'] ++ ++ For comparison, ``split('\n')`` gives:: ++ ++ >>> ''.split('\n') ++ [''] ++ >>> 'Two lines\n'.split('\n') ++ ['Two lines', ''] ++ ++.. method:: unicode.splitlines([keepends]) ++ ++ Return a list of the lines in the string, like :meth:`str.splitlines`. ++ However, the Unicode method splits on the following line boundaries, ++ which are a superset of the :term:`universal newlines` recognized for ++ 8-bit strings. ++ ++ +-----------------------+-----------------------------+ ++ | Representation | Description | ++ +=======================+=============================+ ++ | ``\n`` | Line Feed | ++ +-----------------------+-----------------------------+ ++ | ``\r`` | Carriage Return | ++ +-----------------------+-----------------------------+ ++ | ``\r\n`` | Carriage Return + Line Feed | ++ +-----------------------+-----------------------------+ ++ | ``\v`` or ``\x0b`` | Line Tabulation | ++ +-----------------------+-----------------------------+ ++ | ``\f`` or ``\x0c`` | Form Feed | ++ +-----------------------+-----------------------------+ ++ | ``\x1c`` | File Separator | ++ +-----------------------+-----------------------------+ ++ | ``\x1d`` | Group Separator | ++ +-----------------------+-----------------------------+ ++ | ``\x1e`` | Record Separator | ++ +-----------------------+-----------------------------+ ++ | ``\x85`` | Next Line (C1 Control Code) | ++ +-----------------------+-----------------------------+ ++ | ``\u2028`` | Line Separator | ++ +-----------------------+-----------------------------+ ++ | ``\u2029`` | Paragraph Separator | ++ +-----------------------+-----------------------------+ ++ ++ .. versionchanged:: 2.7 ++ ++ ``\v`` and ``\f`` added to list of line boundaries. + + + .. method:: str.startswith(prefix[, start[, end]]) +@@ -1615,8 +1670,8 @@ + | ``s.append(x)`` | same as ``s[len(s):len(s)] = | \(2) | + | | [x]`` | | + +------------------------------+--------------------------------+---------------------+ +-| ``s.extend(x)`` or | for the most part the same as | \(3) | +-| ``s += t`` | ``s[len(s):len(s)] = x`` | | ++| ``s.extend(t)`` or | for the most part the same as | \(3) | ++| ``s += t`` | ``s[len(s):len(s)] = t`` | | + +------------------------------+--------------------------------+---------------------+ + | ``s *= n`` | updates *s* with its contents | \(11) | + | | repeated *n* times | | +@@ -1653,7 +1708,7 @@ + this misfeature has been deprecated since Python 1.4. + + (3) +- *x* can be any iterable object. ++ *t* can be any iterable object. + + (4) + Raises :exc:`ValueError` when *x* is not found in *s*. When a negative index is +@@ -2872,9 +2927,10 @@ + A special attribute of every module is :attr:`~object.__dict__`. This is the + dictionary containing the module's symbol table. Modifying this dictionary will + actually change the module's symbol table, but direct assignment to the +-:attr:`__dict__` attribute is not possible (you can write ++:attr:`~object.__dict__` attribute is not possible (you can write + ``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but you can't write +-``m.__dict__ = {}``). Modifying :attr:`__dict__` directly is not recommended. ++``m.__dict__ = {}``). Modifying :attr:`~object.__dict__` directly is ++not recommended. + + Modules built into the interpreter are written like this: ````. If loaded from a file, they are written as ``>> urljoin('https://www.cwi.nl/%7Eguido/Python.html', ++ >>> urljoin('http://www.cwi.nl/%7Eguido/Python.html', + ... '//www.python.org/%7Eguido') + 'http://www.python.org/%7Eguido' + +diff -r d33e0cf91556 Doc/library/warnings.rst +--- a/Doc/library/warnings.rst ++++ b/Doc/library/warnings.rst +@@ -140,14 +140,15 @@ + | | warnings, regardless of location | + +---------------+----------------------------------------------+ + +-* *message* is a string containing a regular expression that the warning message +- must match (the match is compiled to always be case-insensitive). ++* *message* is a string containing a regular expression that the start of ++ the warning message must match. The expression is compiled to always be ++ case-insensitive. + + * *category* is a class (a subclass of :exc:`Warning`) of which the warning + category must be a subclass in order to match. + + * *module* is a string containing a regular expression that the module name must +- match (the match is compiled to be case-sensitive). ++ match. The expression is compiled to be case-sensitive. + + * *lineno* is an integer that the line number where the warning occurred must + match, or ``0`` to match all line numbers. +diff -r d33e0cf91556 Doc/library/webbrowser.rst +--- a/Doc/library/webbrowser.rst ++++ b/Doc/library/webbrowser.rst +@@ -20,7 +20,7 @@ + the user exits the browser. + + If the environment variable :envvar:`BROWSER` exists, it is interpreted to +-override the platform default list of browsers, as a :data:`os.pathsep`-separated ++override the platform default list of browsers, as an :data:`os.pathsep`-separated + list of browsers to try in order. When the value of a list part contains the + string ``%s``, then it is interpreted as a literal browser command line to be + used with the argument URL substituted for ``%s``; if the part does not contain +diff -r d33e0cf91556 Doc/library/wsgiref.rst +--- a/Doc/library/wsgiref.rst ++++ b/Doc/library/wsgiref.rst +@@ -711,7 +711,7 @@ + # object that accepts two arguments. For that purpose, we're going to + # use a function (note that you're not limited to a function, you can + # use a class for example). The first argument passed to the function +- # is a dictionary containing CGI-style envrironment variables and the ++ # is a dictionary containing CGI-style environment variables and the + # second variable is the callable object (see PEP 333). + def hello_world_app(environ, start_response): + status = '200 OK' # HTTP Status +diff -r d33e0cf91556 Doc/library/xml.dom.minidom.rst +--- a/Doc/library/xml.dom.minidom.rst ++++ b/Doc/library/xml.dom.minidom.rst +@@ -100,7 +100,7 @@ + + When you are finished with a DOM tree, you may optionally call the + :meth:`unlink` method to encourage early cleanup of the now-unneeded +-objects. :meth:`unlink` is a :mod:`xml.dom.minidom`\ -specific ++objects. :meth:`unlink` is an :mod:`xml.dom.minidom`\ -specific + extension to the DOM API that renders the node and its descendants are + essentially useless. Otherwise, Python's garbage collector will + eventually take care of the objects in the tree. +diff -r d33e0cf91556 Doc/library/zipimport.rst +--- a/Doc/library/zipimport.rst ++++ b/Doc/library/zipimport.rst +@@ -149,7 +149,9 @@ + -------- + + Here is an example that imports a module from a ZIP archive - note that the +-:mod:`zipimport` module is not explicitly used. :: ++:mod:`zipimport` module is not explicitly used. ++ ++.. code-block:: shell-session + + $ unzip -l example.zip + Archive: example.zip +diff -r d33e0cf91556 Doc/reference/datamodel.rst +--- a/Doc/reference/datamodel.rst ++++ b/Doc/reference/datamodel.rst +@@ -481,6 +481,24 @@ + + .. tabularcolumns:: |l|L|l| + ++ .. index:: ++ single: __doc__ (function attribute) ++ single: __name__ (function attribute) ++ single: __module__ (function attribute) ++ single: __dict__ (function attribute) ++ single: __defaults__ (function attribute) ++ single: __code__ (function attribute) ++ single: __globals__ (function attribute) ++ single: __closure__ (function attribute) ++ single: func_doc (function attribute) ++ single: func_name (function attribute) ++ single: func_dict (function attribute) ++ single: func_defaults (function attribute) ++ single: func_code (function attribute) ++ single: func_globals (function attribute) ++ single: func_closure (function attribute) ++ pair: global; namespace ++ + +-----------------------+-------------------------------+-----------+ + | Attribute | Meaning | | + +=======================+===============================+===========+ +@@ -488,7 +506,8 @@ + | :attr:`func_doc` | string, or ``None`` if | | + | | unavailable. | | + +-----------------------+-------------------------------+-----------+ +- | :attr:`__name__` | The function's name. | Writable | ++ | :attr:`~definition.\ | The function's name | Writable | ++ | __name__` | | | + | :attr:`func_name` | | | + +-----------------------+-------------------------------+-----------+ + | :attr:`__module__` | The name of the module the | Writable | +@@ -511,9 +530,9 @@ + | | module in which the function | | + | | was defined. | | + +-----------------------+-------------------------------+-----------+ +- | :attr:`__dict__` | The namespace supporting | Writable | +- | :attr:`func_dict` | arbitrary function | | +- | | attributes. | | ++ | :attr:`~object.\ | The namespace supporting | Writable | ++ | __dict__` | arbitrary function | | ++ | :attr:`func_dict` | attributes. | | + +-----------------------+-------------------------------+-----------+ + | :attr:`__closure__` | ``None`` or a tuple of cells | Read-only | + | :attr:`func_closure` | that contain bindings for the | | +@@ -540,24 +559,6 @@ + Additional information about a function's definition can be retrieved from its + code object; see the description of internal types below. + +- .. index:: +- single: __doc__ (function attribute) +- single: __name__ (function attribute) +- single: __module__ (function attribute) +- single: __dict__ (function attribute) +- single: __defaults__ (function attribute) +- single: __code__ (function attribute) +- single: __globals__ (function attribute) +- single: __closure__ (function attribute) +- single: func_doc (function attribute) +- single: func_name (function attribute) +- single: func_dict (function attribute) +- single: func_defaults (function attribute) +- single: func_code (function attribute) +- single: func_globals (function attribute) +- single: func_closure (function attribute) +- pair: global; namespace +- + User-defined methods + .. index:: + object: method +@@ -571,7 +572,7 @@ + :attr:`im_func` is the function object; :attr:`im_class` is the class of + :attr:`im_self` for bound methods or the class that asked for the method for + unbound methods; :attr:`__doc__` is the method's documentation (same as +- ``im_func.__doc__``); :attr:`__name__` is the method name (same as ++ ``im_func.__doc__``); :attr:`~definition.__name__` is the method name (same as + ``im_func.__name__``); :attr:`__module__` is the name of the module the method + was defined in, or ``None`` if unavailable. + +@@ -683,7 +684,7 @@ + standard built-in module). The number and type of the arguments are + determined by the C function. Special read-only attributes: + :attr:`__doc__` is the function's documentation string, or ``None`` if +- unavailable; :attr:`__name__` is the function's name; :attr:`__self__` is ++ unavailable; :attr:`~definition.__name__` is the function's name; :attr:`__self__` is + set to ``None`` (but see the next item); :attr:`__module__` is the name of + the module the function was defined in or ``None`` if unavailable. + +@@ -744,7 +745,7 @@ + + .. index:: single: __dict__ (module attribute) + +- Special read-only attribute: :attr:`__dict__` is the module's namespace as a ++ Special read-only attribute: :attr:`~object.__dict__` is the module's namespace as a + dictionary object. + + .. impl-detail:: +@@ -806,7 +807,7 @@ + static method object, it is transformed into the object wrapped by the static + method object. See section :ref:`descriptors` for another way in which + attributes retrieved from a class may differ from those actually contained in +- its :attr:`__dict__` (note that only new-style classes support descriptors). ++ its :attr:`~object.__dict__` (note that only new-style classes support descriptors). + + .. index:: triple: class; attribute; assignment + +@@ -824,8 +825,8 @@ + single: __bases__ (class attribute) + single: __doc__ (class attribute) + +- Special attributes: :attr:`__name__` is the class name; :attr:`__module__` is +- the module name in which the class was defined; :attr:`__dict__` is the ++ Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is ++ the module name in which the class was defined; :attr:`~object.__dict__` is the + dictionary containing the class's namespace; :attr:`~class.__bases__` is a + tuple (possibly empty or a singleton) containing the base classes, in the + order of their occurrence in the base class list; :attr:`__doc__` is the +@@ -851,7 +852,7 @@ + objects are also transformed, as if they had been retrieved from class + :class:`C`; see above under "Classes". See section :ref:`descriptors` for + another way in which attributes of a class retrieved via its instances may +- differ from the objects actually stored in the class's :attr:`__dict__`. If no ++ differ from the objects actually stored in the class's :attr:`~object.__dict__`. If no + class attribute is found, and the object's class has a :meth:`__getattr__` + method, that is called to satisfy the lookup. + +@@ -1417,7 +1418,7 @@ + will not be usable in hashed collections. If a class defines mutable objects + and implements a :meth:`__cmp__` or :meth:`__eq__` method, it should not + implement :meth:`__hash__`, since hashable collection implementations require +- that a object's hash value is immutable (if the object's hash value changes, ++ that an object's hash value is immutable (if the object's hash value changes, + it will be in the wrong hash bucket). + + User-defined classes have :meth:`__cmp__` and :meth:`__hash__` methods +@@ -1554,7 +1555,7 @@ + descriptor must be in either the owner's class dictionary or in the class + dictionary for one of its parents). In the examples below, "the attribute" + refers to the attribute whose name is the key of the property in the owner +-class' :attr:`__dict__`. ++class' :attr:`~object.__dict__`. + + + .. method:: object.__get__(self, instance, owner) +diff -r d33e0cf91556 Doc/reference/lexical_analysis.rst +--- a/Doc/reference/lexical_analysis.rst ++++ b/Doc/reference/lexical_analysis.rst +@@ -715,7 +715,10 @@ + + .. index:: single: operators + +-The following tokens are operators:: ++The following tokens are operators: ++ ++.. code-block:: none ++ + + + - * ** / // % + << >> & | ^ ~ +@@ -732,7 +735,9 @@ + + .. index:: single: delimiters + +-The following tokens serve as delimiters in the grammar:: ++The following tokens serve as delimiters in the grammar: ++ ++.. code-block:: none + + ( ) [ ] { } @ + , : . ` = ; +@@ -745,14 +750,18 @@ + but also perform an operation. + + The following printing ASCII characters have special meaning as part of other +-tokens or are otherwise significant to the lexical analyzer:: ++tokens or are otherwise significant to the lexical analyzer: ++ ++.. code-block:: none + + ' " # \ + + .. index:: single: ASCII@ASCII + + The following printing ASCII characters are not used in Python. Their +-occurrence outside string literals and comments is an unconditional error:: ++occurrence outside string literals and comments is an unconditional error: ++ ++.. code-block:: none + + $ ? + +diff -r d33e0cf91556 Doc/tools/extensions/suspicious.py +--- a/Doc/tools/extensions/suspicious.py ++++ b/Doc/tools/extensions/suspicious.py +@@ -270,5 +270,5 @@ + # ignore comments -- too much false positives. + # (although doing this could miss some errors; + # there were two sections "commented-out" by mistake +- # in the Python docs that would not be catched) ++ # in the Python docs that would not be caught) + raise nodes.SkipNode +diff -r d33e0cf91556 Doc/tutorial/classes.rst +--- a/Doc/tutorial/classes.rst ++++ b/Doc/tutorial/classes.rst +@@ -905,8 +905,8 @@ + .. rubric:: Footnotes + + .. [#] Except for one thing. Module objects have a secret read-only attribute called +- :attr:`__dict__` which returns the dictionary used to implement the module's +- namespace; the name :attr:`__dict__` is an attribute but not a global name. ++ :attr:`~object.__dict__` which returns the dictionary used to implement the module's ++ namespace; the name :attr:`~object.__dict__` is an attribute but not a global name. + Obviously, using this violates the abstraction of namespace implementation, and + should be restricted to things like post-mortem debuggers. + +diff -r d33e0cf91556 Doc/tutorial/controlflow.rst +--- a/Doc/tutorial/controlflow.rst ++++ b/Doc/tutorial/controlflow.rst +@@ -473,7 +473,9 @@ + client="John Cleese", + sketch="Cheese Shop Sketch") + +-and of course it would print:: ++and of course it would print: ++ ++.. code-block:: none + + -- Do you have any Limburger ? + -- I'm sorry, we're all out of Limburger +diff -r d33e0cf91556 Doc/tutorial/errors.rst +--- a/Doc/tutorial/errors.rst ++++ b/Doc/tutorial/errors.rst +@@ -345,7 +345,7 @@ + A *finally clause* is always executed before leaving the :keyword:`try` + statement, whether an exception has occurred or not. When an exception has + occurred in the :keyword:`try` clause and has not been handled by an +-:keyword:`except` clause (or it has occurred in a :keyword:`except` or ++:keyword:`except` clause (or it has occurred in an :keyword:`except` or + :keyword:`else` clause), it is re-raised after the :keyword:`finally` clause has + been executed. The :keyword:`finally` clause is also executed "on the way out" + when any other clause of the :keyword:`try` statement is left via a +diff -r d33e0cf91556 Doc/tutorial/interpreter.rst +--- a/Doc/tutorial/interpreter.rst ++++ b/Doc/tutorial/interpreter.rst +@@ -93,7 +93,9 @@ + usually three greater-than signs (``>>>``); for continuation lines it prompts + with the *secondary prompt*, by default three dots (``...``). The interpreter + prints a welcome message stating its version number and a copyright notice +-before printing the first prompt:: ++before printing the first prompt: ++ ++.. code-block:: shell-session + + python + Python 2.7 (#1, Feb 28 2010, 00:02:06) +diff -r d33e0cf91556 Doc/tutorial/modules.rst +--- a/Doc/tutorial/modules.rst ++++ b/Doc/tutorial/modules.rst +@@ -135,7 +135,9 @@ + + you can make the file usable as a script as well as an importable module, + because the code that parses the command line only runs if the module is +-executed as the "main" file:: ++executed as the "main" file: ++ ++.. code-block:: shell-session + + $ python fibo.py 50 + 1 1 2 3 5 8 13 21 34 +diff -r d33e0cf91556 Doc/whatsnew/2.0.rst +--- a/Doc/whatsnew/2.0.rst ++++ b/Doc/whatsnew/2.0.rst +@@ -506,7 +506,7 @@ + you'd use the :func:`apply` built-in function: ``apply(f, args, kw)`` calls the + function :func:`f` with the argument tuple *args* and the keyword arguments in + the dictionary *kw*. :func:`apply` is the same in 2.0, but thanks to a patch +-from Greg Ewing, ``f(*args, **kw)`` as a shorter and clearer way to achieve the ++from Greg Ewing, ``f(*args, **kw)`` is a shorter and clearer way to achieve the + same effect. This syntax is symmetrical with the syntax for defining + functions:: + +diff -r d33e0cf91556 Doc/whatsnew/2.1.rst +--- a/Doc/whatsnew/2.1.rst ++++ b/Doc/whatsnew/2.1.rst +@@ -442,8 +442,8 @@ + f.grammar = "A ::= B (C D)*" + + The dictionary containing attributes can be accessed as the function's +-:attr:`__dict__`. Unlike the :attr:`__dict__` attribute of class instances, in +-functions you can actually assign a new dictionary to :attr:`__dict__`, though ++:attr:`~object.__dict__`. Unlike the :attr:`~object.__dict__` attribute of class instances, in ++functions you can actually assign a new dictionary to :attr:`~object.__dict__`, though + the new value is restricted to a regular Python dictionary; you *can't* be + tricky and set it to a :class:`UserDict` instance, or any other random object + that behaves like a mapping. +@@ -555,7 +555,7 @@ + and experiment with them. With the result experience, perhaps it'll be possible + to design a really good catalog and then build support for it into Python 2.2. + For example, the Distutils :command:`sdist` and :command:`bdist_\*` commands +-could support a ``upload`` option that would automatically upload your ++could support an ``upload`` option that would automatically upload your + package to a catalog server. + + You can start creating packages containing :file:`PKG-INFO` even if you're not +diff -r d33e0cf91556 Doc/whatsnew/2.2.rst +--- a/Doc/whatsnew/2.2.rst ++++ b/Doc/whatsnew/2.2.rst +@@ -157,7 +157,7 @@ + conventions, such as defining :attr:`__members__` and :attr:`__methods__` + attributes that were lists of names, but often the author of an extension type + or a class wouldn't bother to define them. You could fall back on inspecting +-the :attr:`__dict__` of an object, but when class inheritance or an arbitrary ++the :attr:`~object.__dict__` of an object, but when class inheritance or an arbitrary + :meth:`__getattr__` hook were in use this could still be inaccurate. + + The one big idea underlying the new class model is that an API for describing +@@ -169,7 +169,7 @@ + Attribute descriptors are objects that live inside class objects, and have a few + attributes of their own: + +-* :attr:`__name__` is the attribute's name. ++* :attr:`~definition.__name__` is the attribute's name. + + * :attr:`__doc__` is the attribute's docstring. + +@@ -329,7 +329,7 @@ + to trap attribute references. Writing a :meth:`__getattr__` method is + complicated because to avoid recursion you can't use regular attribute accesses + inside them, and instead have to mess around with the contents of +-:attr:`__dict__`. :meth:`__getattr__` methods also end up being called by Python ++:attr:`~object.__dict__`. :meth:`__getattr__` methods also end up being called by Python + when it checks for other methods such as :meth:`__repr__` or :meth:`__coerce__`, + and so have to be written with this in mind. Finally, calling a function on + every attribute access results in a sizable performance loss. +@@ -357,15 +357,15 @@ + That is certainly clearer and easier to write than a pair of + :meth:`__getattr__`/:meth:`__setattr__` methods that check for the :attr:`size` + attribute and handle it specially while retrieving all other attributes from the +-instance's :attr:`__dict__`. Accesses to :attr:`size` are also the only ones ++instance's :attr:`~object.__dict__`. Accesses to :attr:`size` are also the only ones + which have to perform the work of calling a function, so references to other + attributes run at their usual speed. + + Finally, it's possible to constrain the list of attributes that can be +-referenced on an object using the new :attr:`__slots__` class attribute. Python ++referenced on an object using the new :attr:`~object.__slots__` class attribute. Python + objects are usually very dynamic; at any time it's possible to define a new + attribute on an instance by just doing ``obj.new_attr=1``. A new-style class +-can define a class attribute named :attr:`__slots__` to limit the legal ++can define a class attribute named :attr:`~object.__slots__` to limit the legal + attributes to a particular set of names. An example will make this clear:: + + >>> class C(object): +@@ -383,7 +383,7 @@ + AttributeError: 'C' object has no attribute 'newattr' + + Note how you get an :exc:`AttributeError` on the attempt to assign to an +-attribute not listed in :attr:`__slots__`. ++attribute not listed in :attr:`~object.__slots__`. + + + .. _sect-rellinks: +diff -r d33e0cf91556 Doc/whatsnew/2.3.rst +--- a/Doc/whatsnew/2.3.rst ++++ b/Doc/whatsnew/2.3.rst +@@ -291,7 +291,9 @@ + The new :mod:`zipimport` module adds support for importing modules from a ZIP- + format archive. You don't need to import the module explicitly; it will be + automatically imported if a ZIP archive's filename is added to ``sys.path``. +-For example:: ++For example: ++ ++.. code-block:: shell-session + + amk@nyman:~/src/python$ unzip -l /tmp/example.zip + Archive: /tmp/example.zip +@@ -1111,10 +1113,10 @@ + + + * One of the noted incompatibilities between old- and new-style classes has been +- removed: you can now assign to the :attr:`__name__` and :attr:`__bases__` ++ removed: you can now assign to the :attr:`~definition.__name__` and :attr:`~class.__bases__` + attributes of new-style classes. There are some restrictions on what can be +- assigned to :attr:`__bases__` along the lines of those relating to assigning to +- an instance's :attr:`__class__` attribute. ++ assigned to :attr:`~class.__bases__` along the lines of those relating to assigning to ++ an instance's :attr:`~instance.__class__` attribute. + + .. ====================================================================== + +@@ -1761,7 +1763,9 @@ + strings containing the remaining arguments. + + Invoking the script with the various arguments now works as you'd expect it to. +-Note that the length argument is automatically converted to an integer. :: ++Note that the length argument is automatically converted to an integer. ++ ++.. code-block:: shell-session + + $ ./python opt.py -i data arg1 + +@@ -1771,7 +1775,9 @@ + [] + $ + +-The help message is automatically generated for you:: ++The help message is automatically generated for you: ++ ++.. code-block:: shell-session + + $ ./python opt.py --help + usage: opt.py [options] +@@ -1920,7 +1926,7 @@ + + * If you dynamically allocate type objects in your extension, you should be + aware of a change in the rules relating to the :attr:`__module__` and +- :attr:`__name__` attributes. In summary, you will want to ensure the type's ++ :attr:`~definition.__name__` attributes. In summary, you will want to ensure the type's + dictionary contains a ``'__module__'`` key; making the module name the part of + the type name leading up to the final period will no longer have the desired + effect. For more detail, read the API reference documentation or the source. +@@ -2078,4 +2084,3 @@ + MacIntyre, Lalo Martins, Chad Netzer, Gustavo Niemeyer, Neal Norwitz, Hans + Nowak, Chris Reedy, Francesco Ricciardi, Vinay Sajip, Neil Schemenauer, Roman + Suzi, Jason Tishler, Just van Rossum. +- +diff -r d33e0cf91556 Doc/whatsnew/2.4.rst +--- a/Doc/whatsnew/2.4.rst ++++ b/Doc/whatsnew/2.4.rst +@@ -1425,7 +1425,9 @@ + print word + + Running the above function's tests with :const:`doctest.REPORT_UDIFF` specified, +-you get the following output:: ++you get the following output: ++ ++.. code-block:: none + + ********************************************************************** + File "t.py", line 15, in g +diff -r d33e0cf91556 Doc/whatsnew/2.7.rst +--- a/Doc/whatsnew/2.7.rst ++++ b/Doc/whatsnew/2.7.rst +@@ -532,7 +532,7 @@ + calling ``log.getChild('network.listen')`` is equivalent to + ``getLogger('app.network.listen')``. + +-* The :class:`~logging.LoggerAdapter` class gained a ++* The :class:`~logging.LoggerAdapter` class gained an + :meth:`~logging.LoggerAdapter.isEnabledFor` method that takes a + *level* and returns whether the underlying logger would + process a message of that level of importance. +@@ -2266,7 +2266,9 @@ + written in pure Python could cause a segmentation fault by taking a + :c:type:`PyCObject` from module A and somehow substituting it for the + :c:type:`PyCObject` in module B. Capsules know their own name, +-and getting the pointer requires providing the name:: ++and getting the pointer requires providing the name: ++ ++.. code-block:: c + + void *vtable; + +@@ -2705,4 +2707,3 @@ + suggestions, corrections and assistance with various drafts of this + article: Nick Coghlan, Philip Jenvey, Ryan Lovett, R. David Murray, + Hugh Secker-Walker. +- +diff -r d33e0cf91556 Include/abstract.h +--- a/Include/abstract.h ++++ b/Include/abstract.h +@@ -94,7 +94,7 @@ + numeric, sequence, and mapping. Each protocol consists of a + collection of related operations. If an operation that is not + provided by a particular type is invoked, then a standard exception, +- NotImplementedError is raised with a operation name as an argument. ++ NotImplementedError is raised with an operation name as an argument. + In addition, for convenience this interface defines a set of + constructors for building objects of built-in types. This is needed + so new objects can be returned from C functions that otherwise treat +diff -r d33e0cf91556 Include/codecs.h +--- a/Include/codecs.h ++++ b/Include/codecs.h +@@ -146,14 +146,14 @@ + const char *encoding + ); + +-/* Get a IncrementalEncoder object for the given encoding. */ ++/* Get an IncrementalEncoder object for the given encoding. */ + + PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder( + const char *encoding, + const char *errors + ); + +-/* Get a IncrementalDecoder object function for the given encoding. */ ++/* Get an IncrementalDecoder object function for the given encoding. */ + + PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder( + const char *encoding, +diff -r d33e0cf91556 Include/longobject.h +--- a/Include/longobject.h ++++ b/Include/longobject.h +@@ -110,7 +110,7 @@ + example, if is_signed is 0 and there are more digits in the v than + fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of + being large enough to hold a sign bit. OverflowError is set in this +- case, but bytes holds the least-signficant n bytes of the true value. ++ case, but bytes holds the least-significant n bytes of the true value. + */ + PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, + unsigned char* bytes, size_t n, +diff -r d33e0cf91556 Include/object.h +--- a/Include/object.h ++++ b/Include/object.h +@@ -778,7 +778,7 @@ + } while (0) + + /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear +- * and tp_dealloc implementatons. ++ * and tp_dealloc implementations. + * + * Note that "the obvious" code can be deadly: + * +diff -r d33e0cf91556 Include/patchlevel.h +--- a/Include/patchlevel.h ++++ b/Include/patchlevel.h +@@ -27,7 +27,7 @@ + #define PY_RELEASE_SERIAL 0 + + /* Version as a string */ +-#define PY_VERSION "2.7.12" ++#define PY_VERSION "2.7.12+" + /*--end constants--*/ + + /* Subversion Revision number of this file (not of the repository). Empty +diff -r d33e0cf91556 Include/pymacconfig.h +--- a/Include/pymacconfig.h ++++ b/Include/pymacconfig.h +@@ -63,7 +63,7 @@ + # if defined(__LP64__) + /* MacOSX 10.4 (the first release to support 64-bit code + * at all) only supports 64-bit in the UNIX layer. +- * Therefore surpress the toolbox-glue in 64-bit mode. ++ * Therefore suppress the toolbox-glue in 64-bit mode. + */ + + /* In 64-bit mode setpgrp always has no arguments, in 32-bit +@@ -91,7 +91,7 @@ + * + * Specifically: OSX 10.4 has limited supported for '%zd', while + * 10.5 has full support for '%zd'. A binary built on 10.5 won't +- * work properly on 10.4 unless we surpress the definition ++ * work properly on 10.4 unless we suppress the definition + * of PY_FORMAT_SIZE_T + */ + #undef PY_FORMAT_SIZE_T +diff -r d33e0cf91556 Include/pyport.h +--- a/Include/pyport.h ++++ b/Include/pyport.h +@@ -265,7 +265,7 @@ + * for platforms that support that. + * + * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more +- * "aggressive" inlining/optimizaion is enabled for the entire module. This ++ * "aggressive" inlining/optimization is enabled for the entire module. This + * may lead to code bloat, and may slow things down for those reasons. It may + * also lead to errors, if the code relies on pointer aliasing. Use with + * care. +@@ -702,7 +702,9 @@ + + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version > 500039 ++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ ++ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ ++ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) + # define _PY_PORT_CTYPE_UTF8_ISSUE + #endif + #endif +@@ -713,6 +715,12 @@ + #endif + + #ifdef _PY_PORT_CTYPE_UTF8_ISSUE ++#ifndef __cplusplus ++ /* The workaround below is unsafe in C++ because ++ * the defines these symbols as real functions, ++ * with a slightly different signature. ++ * See issue #10910 ++ */ + #include + #include + #undef isalnum +@@ -730,6 +738,7 @@ + #undef toupper + #define toupper(c) towupper(btowc(c)) + #endif ++#endif + + + /* Declarations for symbol visibility. +diff -r d33e0cf91556 Include/unicodeobject.h +--- a/Include/unicodeobject.h ++++ b/Include/unicodeobject.h +@@ -1138,7 +1138,7 @@ + + These are capable of handling Unicode objects and strings on input + (we refer to them as strings in the descriptions) and return +- Unicode objects or integers as apporpriate. */ ++ Unicode objects or integers as appropriate. */ + + /* Concat two strings giving a new Unicode string. */ + +@@ -1288,7 +1288,7 @@ + /* Rich compare two strings and return one of the following: + + - NULL in case an exception was raised +- - Py_True or Py_False for successfuly comparisons ++ - Py_True or Py_False for successful comparisons + - Py_NotImplemented in case the type combination is unknown + + Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in +diff -r d33e0cf91556 Lib/SimpleXMLRPCServer.py +--- a/Lib/SimpleXMLRPCServer.py ++++ b/Lib/SimpleXMLRPCServer.py +@@ -188,7 +188,7 @@ + are considered private and will not be called by + SimpleXMLRPCServer. + +- If a registered function matches a XML-RPC request, then it ++ If a registered function matches an XML-RPC request, then it + will be called instead of the registered instance. + + If the optional allow_dotted_names argument is true and the +diff -r d33e0cf91556 Lib/_pyio.py +--- a/Lib/_pyio.py ++++ b/Lib/_pyio.py +@@ -274,7 +274,7 @@ + Even though IOBase does not declare read, readinto, or write because + their signatures will vary, implementations and clients should + consider those methods part of the interface. Also, implementations +- may raise a IOError when operations they do not support are called. ++ may raise an IOError when operations they do not support are called. + + The basic type used for binary data read from or written to a file is + the bytes type. Method arguments may also be bytearray or memoryview of +diff -r d33e0cf91556 Lib/chunk.py +--- a/Lib/chunk.py ++++ b/Lib/chunk.py +@@ -21,7 +21,7 @@ + usage of the Chunk class defined here is to instantiate an instance at + the start of each chunk and read from the instance until it reaches + the end, after which a new instance can be instantiated. At the end +-of the file, creating a new instance will fail with a EOFError ++of the file, creating a new instance will fail with an EOFError + exception. + + Usage: +diff -r d33e0cf91556 Lib/codecs.py +--- a/Lib/codecs.py ++++ b/Lib/codecs.py +@@ -252,7 +252,7 @@ + """ + def __init__(self, errors='strict'): + """ +- Creates a IncrementalDecoder instance. ++ Creates an IncrementalDecoder instance. + + The IncrementalDecoder may use different error handling schemes by + providing the errors keyword argument. See the module docstring +@@ -1012,7 +1012,7 @@ + """ + Encoding iterator. + +- Encodes the input strings from the iterator using a IncrementalEncoder. ++ Encodes the input strings from the iterator using an IncrementalEncoder. + + errors and kwargs are passed through to the IncrementalEncoder + constructor. +@@ -1030,7 +1030,7 @@ + """ + Decoding iterator. + +- Decodes the input strings from the iterator using a IncrementalDecoder. ++ Decodes the input strings from the iterator using an IncrementalDecoder. + + errors and kwargs are passed through to the IncrementalDecoder + constructor. +diff -r d33e0cf91556 Lib/cookielib.py +--- a/Lib/cookielib.py ++++ b/Lib/cookielib.py +@@ -113,7 +113,7 @@ + """ + if t is None: t = time.time() + year, mon, mday, hour, min, sec, wday = time.gmtime(t)[:7] +- return "%s %02d-%s-%04d %02d:%02d:%02d GMT" % ( ++ return "%s, %02d-%s-%04d %02d:%02d:%02d GMT" % ( + DAYS[wday], mday, MONTHS[mon-1], year, hour, min, sec) + + +diff -r d33e0cf91556 Lib/ctypes/test/test_callbacks.py +--- a/Lib/ctypes/test/test_callbacks.py ++++ b/Lib/ctypes/test/test_callbacks.py +@@ -1,3 +1,4 @@ ++import functools + import unittest + from ctypes import * + from ctypes.test import need_symbol +@@ -246,6 +247,40 @@ + self.assertEqual(result, + callback(1.1*1.1, 2.2*2.2, 3.3*3.3, 4.4*4.4, 5.5*5.5)) + ++ def test_callback_large_struct(self): ++ class Check: pass ++ ++ class X(Structure): ++ _fields_ = [ ++ ('first', c_ulong), ++ ('second', c_ulong), ++ ('third', c_ulong), ++ ] ++ ++ def callback(check, s): ++ check.first = s.first ++ check.second = s.second ++ check.third = s.third ++ ++ check = Check() ++ s = X() ++ s.first = 0xdeadbeef ++ s.second = 0xcafebabe ++ s.third = 0x0bad1dea ++ ++ CALLBACK = CFUNCTYPE(None, X) ++ dll = CDLL(_ctypes_test.__file__) ++ func = dll._testfunc_cbk_large_struct ++ func.argtypes = (X, CALLBACK) ++ func.restype = None ++ # the function just calls the callback with the passed structure ++ func(s, CALLBACK(functools.partial(callback, check))) ++ self.assertEqual(check.first, s.first) ++ self.assertEqual(check.second, s.second) ++ self.assertEqual(check.third, s.third) ++ self.assertEqual(check.first, 0xdeadbeef) ++ self.assertEqual(check.second, 0xcafebabe) ++ self.assertEqual(check.third, 0x0bad1dea) + + ################################################################ + +diff -r d33e0cf91556 Lib/ctypes/test/test_find.py +--- a/Lib/ctypes/test/test_find.py ++++ b/Lib/ctypes/test/test_find.py +@@ -1,6 +1,7 @@ + import unittest +-import os ++import os, os.path + import sys ++from test import test_support + from ctypes import * + from ctypes.util import find_library + from ctypes.test import is_resource_enabled +@@ -65,6 +66,11 @@ + if self.gle: + self.gle.gleGetJoinStyle + ++ def test_shell_injection(self): ++ result = find_library('; echo Hello shell > ' + test_support.TESTFN) ++ self.assertFalse(os.path.lexists(test_support.TESTFN)) ++ self.assertIsNone(result) ++ + # On platforms where the default shared library suffix is '.so', + # at least some libraries can be loaded as attributes of the cdll + # object, since ctypes now tries loading the lib again +diff -r d33e0cf91556 Lib/ctypes/test/test_numbers.py +--- a/Lib/ctypes/test/test_numbers.py ++++ b/Lib/ctypes/test/test_numbers.py +@@ -76,7 +76,7 @@ + self.assertEqual(t(v).value, truth(v)) + + def test_typeerror(self): +- # Only numbers are allowed in the contructor, ++ # Only numbers are allowed in the constructor, + # otherwise TypeError is raised + for t in signed_types + unsigned_types + float_types: + self.assertRaises(TypeError, t, "") +diff -r d33e0cf91556 Lib/ctypes/test/test_structures.py +--- a/Lib/ctypes/test/test_structures.py ++++ b/Lib/ctypes/test/test_structures.py +@@ -106,7 +106,7 @@ + self.assertEqual(alignment(XX), alignment(X)) + self.assertEqual(sizeof(XX), calcsize("3s 3s 0s")) + +- def test_emtpy(self): ++ def test_empty(self): + # I had problems with these + # + # Although these are pathological cases: Empty Structures! +diff -r d33e0cf91556 Lib/ctypes/util.py +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -1,4 +1,6 @@ +-import sys, os ++import os ++import subprocess ++import sys + + # find_library(name) returns the pathname of a library, or None. + if os.name == "nt": +@@ -86,25 +88,28 @@ + import re, tempfile, errno + + def _findLib_gcc(name): ++ # Run GCC's linker with the -t (aka --trace) option and examine the ++ # library name it prints out. The GCC command will fail because we ++ # haven't supplied a proper program with main(), but that does not ++ # matter. + expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) +- fdout, ccout = tempfile.mkstemp() +- os.close(fdout) +- cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \ +- 'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name ++ cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit; fi;' \ ++ 'LANG=C LC_ALL=C $CC -Wl,-t -o "$2" 2>&1 -l"$1"' ++ ++ temp = tempfile.NamedTemporaryFile() + try: +- f = os.popen(cmd) +- try: +- trace = f.read() +- finally: +- rv = f.close() ++ proc = subprocess.Popen((cmd, '_findLib_gcc', name, temp.name), ++ shell=True, ++ stdout=subprocess.PIPE) ++ [trace, _] = proc.communicate() + finally: + try: +- os.unlink(ccout) ++ temp.close() + except OSError, e: ++ # ENOENT is raised if the file was already removed, which is ++ # the normal behaviour of GCC if linking fails + if e.errno != errno.ENOENT: + raise +- if rv == 10: +- raise OSError, 'gcc or cc command not found' + res = re.search(expr, trace) + if not res: + return None +@@ -116,13 +121,17 @@ + def _get_soname(f): + if not f: + return None +- cmd = "/usr/ccs/bin/dump -Lpv 2>/dev/null " + f +- f = os.popen(cmd) ++ ++ null = open(os.devnull, "wb") + try: +- data = f.read() +- finally: +- f.close() +- res = re.search(r'\[.*\]\sSONAME\s+([^\s]+)', data) ++ with null: ++ proc = subprocess.Popen(("/usr/ccs/bin/dump", "-Lpv", f), ++ stdout=subprocess.PIPE, ++ stderr=null) ++ except OSError: # E.g. command not found ++ return None ++ [data, _] = proc.communicate() ++ res = re.search(br'\[.*\]\sSONAME\s+([^\s]+)', data) + if not res: + return None + return res.group(1) +@@ -131,16 +140,12 @@ + # assuming GNU binutils / ELF + if not f: + return None +- cmd = 'if ! type objdump >/dev/null 2>&1; then exit 10; fi;' \ +- "objdump -p -j .dynamic 2>/dev/null " + f +- f = os.popen(cmd) +- try: +- dump = f.read() +- finally: +- rv = f.close() +- if rv == 10: +- raise OSError, 'objdump command not found' +- res = re.search(r'\sSONAME\s+([^\s]+)', dump) ++ cmd = 'if ! type objdump >/dev/null 2>&1; then exit; fi;' \ ++ 'objdump -p -j .dynamic 2>/dev/null "$1"' ++ proc = subprocess.Popen((cmd, '_get_soname', f), shell=True, ++ stdout=subprocess.PIPE) ++ [dump, _] = proc.communicate() ++ res = re.search(br'\sSONAME\s+([^\s]+)', dump) + if not res: + return None + return res.group(1) +@@ -151,23 +156,30 @@ + + def _num_version(libname): + # "libxyz.so.MAJOR.MINOR" => [ MAJOR, MINOR ] +- parts = libname.split(".") ++ parts = libname.split(b".") + nums = [] + try: + while parts: + nums.insert(0, int(parts.pop())) + except ValueError: + pass +- return nums or [ sys.maxint ] ++ return nums or [sys.maxint] + + def find_library(name): + ename = re.escape(name) + expr = r':-l%s\.\S+ => \S*/(lib%s\.\S+)' % (ename, ename) +- f = os.popen('/sbin/ldconfig -r 2>/dev/null') ++ ++ null = open(os.devnull, 'wb') + try: +- data = f.read() +- finally: +- f.close() ++ with null: ++ proc = subprocess.Popen(('/sbin/ldconfig', '-r'), ++ stdout=subprocess.PIPE, ++ stderr=null) ++ except OSError: # E.g. command not found ++ data = b'' ++ else: ++ [data, _] = proc.communicate() ++ + res = re.findall(expr, data) + if not res: + return _get_soname(_findLib_gcc(name)) +@@ -180,16 +192,32 @@ + if not os.path.exists('/usr/bin/crle'): + return None + ++ env = dict(os.environ) ++ env['LC_ALL'] = 'C' ++ + if is64: +- cmd = 'env LC_ALL=C /usr/bin/crle -64 2>/dev/null' ++ args = ('/usr/bin/crle', '-64') + else: +- cmd = 'env LC_ALL=C /usr/bin/crle 2>/dev/null' ++ args = ('/usr/bin/crle',) + + paths = None +- for line in os.popen(cmd).readlines(): +- line = line.strip() +- if line.startswith('Default Library Path (ELF):'): +- paths = line.split()[4] ++ null = open(os.devnull, 'wb') ++ try: ++ with null: ++ proc = subprocess.Popen(args, ++ stdout=subprocess.PIPE, ++ stderr=null, ++ env=env) ++ except OSError: # E.g. bad executable ++ return None ++ try: ++ for line in proc.stdout: ++ line = line.strip() ++ if line.startswith(b'Default Library Path (ELF):'): ++ paths = line.split()[4] ++ finally: ++ proc.stdout.close() ++ proc.wait() + + if not paths: + return None +@@ -223,11 +251,20 @@ + + # XXX assuming GLIBC's ldconfig (with option -p) + expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type) +- f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null') ++ ++ env = dict(os.environ) ++ env['LC_ALL'] = 'C' ++ env['LANG'] = 'C' ++ null = open(os.devnull, 'wb') + try: +- data = f.read() +- finally: +- f.close() ++ with null: ++ p = subprocess.Popen(['/sbin/ldconfig', '-p'], ++ stderr=null, ++ stdout=subprocess.PIPE, ++ env=env) ++ except OSError: # E.g. command not found ++ return None ++ [data, _] = p.communicate() + res = re.search(expr, data) + if not res: + return None +diff -r d33e0cf91556 Lib/curses/ascii.py +--- a/Lib/curses/ascii.py ++++ b/Lib/curses/ascii.py +@@ -54,13 +54,13 @@ + def isalnum(c): return isalpha(c) or isdigit(c) + def isalpha(c): return isupper(c) or islower(c) + def isascii(c): return _ctoi(c) <= 127 # ? +-def isblank(c): return _ctoi(c) in (8,32) +-def iscntrl(c): return _ctoi(c) <= 31 ++def isblank(c): return _ctoi(c) in (9, 32) ++def iscntrl(c): return _ctoi(c) <= 31 or _ctoi(c) == 127 + def isdigit(c): return _ctoi(c) >= 48 and _ctoi(c) <= 57 + def isgraph(c): return _ctoi(c) >= 33 and _ctoi(c) <= 126 + def islower(c): return _ctoi(c) >= 97 and _ctoi(c) <= 122 + def isprint(c): return _ctoi(c) >= 32 and _ctoi(c) <= 126 +-def ispunct(c): return _ctoi(c) != 32 and not isalnum(c) ++def ispunct(c): return isgraph(c) and not isalnum(c) + def isspace(c): return _ctoi(c) in (9, 10, 11, 12, 13, 32) + def isupper(c): return _ctoi(c) >= 65 and _ctoi(c) <= 90 + def isxdigit(c): return isdigit(c) or \ +diff -r d33e0cf91556 Lib/decimal.py +--- a/Lib/decimal.py ++++ b/Lib/decimal.py +@@ -1048,12 +1048,11 @@ + return sign + intpart + fracpart + exp + + def to_eng_string(self, context=None): +- """Convert to engineering-type string. +- +- Engineering notation has an exponent which is a multiple of 3, so there +- are up to 3 digits left of the decimal place. +- +- Same rules for when in exponential and when as a value as in __str__. ++ """Convert to a string, using engineering notation if an exponent is needed. ++ ++ Engineering notation has an exponent which is a multiple of 3. This ++ can leave up to 3 digits to the left of the decimal place and may ++ require the addition of either one or two trailing zeros. + """ + return self.__str__(eng=True, context=context) + +@@ -5339,9 +5338,29 @@ + return r + + def to_eng_string(self, a): +- """Converts a number to a string, using scientific notation. ++ """Convert to a string, using engineering notation if an exponent is needed. ++ ++ Engineering notation has an exponent which is a multiple of 3. This ++ can leave up to 3 digits to the left of the decimal place and may ++ require the addition of either one or two trailing zeros. + + The operation is not affected by the context. ++ ++ >>> ExtendedContext.to_eng_string(Decimal('123E+1')) ++ '1.23E+3' ++ >>> ExtendedContext.to_eng_string(Decimal('123E+3')) ++ '123E+3' ++ >>> ExtendedContext.to_eng_string(Decimal('123E-10')) ++ '12.3E-9' ++ >>> ExtendedContext.to_eng_string(Decimal('-123E-12')) ++ '-123E-12' ++ >>> ExtendedContext.to_eng_string(Decimal('7E-7')) ++ '700E-9' ++ >>> ExtendedContext.to_eng_string(Decimal('7E+1')) ++ '70' ++ >>> ExtendedContext.to_eng_string(Decimal('0E+1')) ++ '0.00E+3' ++ + """ + a = _convert_other(a, raiseit=True) + return a.to_eng_string(context=self) +diff -r d33e0cf91556 Lib/distutils/config.py +--- a/Lib/distutils/config.py ++++ b/Lib/distutils/config.py +@@ -21,7 +21,7 @@ + class PyPIRCCommand(Command): + """Base command that knows how to handle the .pypirc file + """ +- DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi' ++ DEFAULT_REPOSITORY = 'https://upload.pypi.org/legacy/' + DEFAULT_REALM = 'pypi' + repository = None + realm = None +diff -r d33e0cf91556 Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -347,7 +347,7 @@ + # class Mingw32CCompiler + + # Because these compilers aren't configured in Python's pyconfig.h file by +-# default, we should at least warn the user if he is using a unmodified ++# default, we should at least warn the user if he is using an unmodified + # version. + + CONFIG_H_OK = "ok" +diff -r d33e0cf91556 Lib/distutils/tests/test_build_ext.py +--- a/Lib/distutils/tests/test_build_ext.py ++++ b/Lib/distutils/tests/test_build_ext.py +@@ -215,7 +215,7 @@ + self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts) + + # second element of each tuple in 'ext_modules' +- # must be a ary (build info) ++ # must be a dictionary (build info) + exts = [('foo.bar', '')] + self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts) + +diff -r d33e0cf91556 Lib/distutils/tests/test_config.py +--- a/Lib/distutils/tests/test_config.py ++++ b/Lib/distutils/tests/test_config.py +@@ -89,7 +89,7 @@ + config = config.items() + config.sort() + waited = [('password', 'secret'), ('realm', 'pypi'), +- ('repository', 'https://pypi.python.org/pypi'), ++ ('repository', 'https://upload.pypi.org/legacy/'), + ('server', 'server1'), ('username', 'me')] + self.assertEqual(config, waited) + +@@ -99,7 +99,7 @@ + config = config.items() + config.sort() + waited = [('password', 'secret'), ('realm', 'pypi'), +- ('repository', 'https://pypi.python.org/pypi'), ++ ('repository', 'https://upload.pypi.org/legacy/'), + ('server', 'server-login'), ('username', 'tarek')] + self.assertEqual(config, waited) + +diff -r d33e0cf91556 Lib/distutils/tests/test_upload.py +--- a/Lib/distutils/tests/test_upload.py ++++ b/Lib/distutils/tests/test_upload.py +@@ -82,7 +82,7 @@ + cmd.finalize_options() + for attr, waited in (('username', 'me'), ('password', 'secret'), + ('realm', 'pypi'), +- ('repository', 'https://pypi.python.org/pypi')): ++ ('repository', 'https://upload.pypi.org/legacy/')): + self.assertEqual(getattr(cmd, attr), waited) + + def test_saved_password(self): +@@ -123,7 +123,7 @@ + self.assertTrue(headers['Content-type'].startswith('multipart/form-data')) + self.assertEqual(self.last_open.req.get_method(), 'POST') + self.assertEqual(self.last_open.req.get_full_url(), +- 'https://pypi.python.org/pypi') ++ 'https://upload.pypi.org/legacy/') + self.assertIn('xxx', self.last_open.req.data) + auth = self.last_open.req.headers['Authorization'] + self.assertNotIn('\n', auth) +diff -r d33e0cf91556 Lib/distutils/unixccompiler.py +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -230,6 +230,8 @@ + if sys.platform[:6] == "darwin": + # MacOSX's linker doesn't understand the -R flag at all + return "-L" + dir ++ elif sys.platform[:7] == "freebsd": ++ return "-Wl,-rpath=" + dir + elif sys.platform[:5] == "hp-ux": + if self._is_gcc(compiler): + return ["-Wl,+s", "-L" + dir] +diff -r d33e0cf91556 Lib/email/base64mime.py +--- a/Lib/email/base64mime.py ++++ b/Lib/email/base64mime.py +@@ -166,7 +166,7 @@ + decoding a text attachment. + + This function does not parse a full MIME header value encoded with +- base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high ++ base64 (like =?iso-8859-1?b?bmloISBuaWgh?=) -- please use the high + level email.header class for that functionality. + """ + if not s: +diff -r d33e0cf91556 Lib/email/quoprimime.py +--- a/Lib/email/quoprimime.py ++++ b/Lib/email/quoprimime.py +@@ -329,7 +329,7 @@ + """Decode a string encoded with RFC 2045 MIME header `Q' encoding. + + This function does not parse a full MIME header value encoded with +- quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use ++ quoted-printable (like =?iso-8859-1?q?Hello_World?=) -- please use + the high level email.header class for that functionality. + """ + s = s.replace('_', ' ') +diff -r d33e0cf91556 Lib/email/test/test_email.py +--- a/Lib/email/test/test_email.py ++++ b/Lib/email/test/test_email.py +@@ -1673,9 +1673,9 @@ + + def test_rfc2047_Q_invalid_digits(self): + # issue 10004. +- s = '=?iso-8659-1?Q?andr=e9=zz?=' ++ s = '=?iso-8859-1?Q?andr=e9=zz?=' + self.assertEqual(decode_header(s), +- [(b'andr\xe9=zz', 'iso-8659-1')]) ++ [(b'andr\xe9=zz', 'iso-8859-1')]) + + + # Test the MIMEMessage class +diff -r d33e0cf91556 Lib/ensurepip/__init__.py +--- a/Lib/ensurepip/__init__.py ++++ b/Lib/ensurepip/__init__.py +@@ -12,9 +12,9 @@ + __all__ = ["version", "bootstrap"] + + +-_SETUPTOOLS_VERSION = "20.10.1" ++_SETUPTOOLS_VERSION = "25.2.0" + +-_PIP_VERSION = "8.1.1" ++_PIP_VERSION = "8.1.2" + + # pip currently requires ssl support, so we try to provide a nicer + # error message when that is missing (http://bugs.python.org/issue19744) +diff -r d33e0cf91556 Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl has changed +diff -r d33e0cf91556 Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl has changed +diff -r d33e0cf91556 Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl has changed +diff -r d33e0cf91556 Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl +Binary file Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl has changed +diff -r d33e0cf91556 Lib/ftplib.py +--- a/Lib/ftplib.py ++++ b/Lib/ftplib.py +@@ -264,7 +264,7 @@ + return self.voidcmd(cmd) + + def sendeprt(self, host, port): +- '''Send a EPRT command with the current host and the given port number.''' ++ '''Send an EPRT command with the current host and the given port number.''' + af = 0 + if self.af == socket.AF_INET: + af = 1 +@@ -842,7 +842,7 @@ + + + def parse229(resp, peer): +- '''Parse the '229' response for a EPSV request. ++ '''Parse the '229' response for an EPSV request. + Raises error_proto if it does not contain '(|||port|)' + Return ('host.addr.as.numbers', port#) tuple.''' + +diff -r d33e0cf91556 Lib/idlelib/CallTipWindow.py +--- a/Lib/idlelib/CallTipWindow.py ++++ b/Lib/idlelib/CallTipWindow.py +@@ -9,7 +9,7 @@ + HIDE_SEQUENCES = ("", "") + CHECKHIDE_VIRTUAL_EVENT_NAME = "<>" + CHECKHIDE_SEQUENCES = ("", "") +-CHECKHIDE_TIME = 100 # miliseconds ++CHECKHIDE_TIME = 100 # milliseconds + + MARK_RIGHT = "calltipwindowregion_right" + +diff -r d33e0cf91556 Lib/idlelib/EditorWindow.py +--- a/Lib/idlelib/EditorWindow.py ++++ b/Lib/idlelib/EditorWindow.py +@@ -1384,7 +1384,7 @@ + text.see("insert") + text.undo_block_stop() + +- # Our editwin provides a is_char_in_string function that works ++ # Our editwin provides an is_char_in_string function that works + # with a Tk text index, but PyParse only knows about offsets into + # a string. This builds a function for PyParse that accepts an + # offset. +diff -r d33e0cf91556 Lib/idlelib/NEWS.txt +--- a/Lib/idlelib/NEWS.txt ++++ b/Lib/idlelib/NEWS.txt +@@ -1,6 +1,23 @@ ++What's New in IDLE 2.7.13? ++========================== ++*Release date: 2017-01-01?* ++ ++- Issue #27714: text_textview and test_autocomplete now pass when re-run ++ in the same process. This occurs when test_idle fails when run with the ++ -w option but without -jn. Fix warning from test_config. ++ ++- Issue #27452: add line counter and crc to IDLE configHandler test dump. ++ ++- Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names. ++ ++- Issue #27245: IDLE: Cleanly delete custom themes and key bindings. ++ Previously, when IDLE was started from a console or by import, a cascade ++ of warnings was emitted. Patch by Serhiy Storchaka. ++ ++ + What's New in IDLE 2.7.12? + ========================== +-*Release date: 2015-06-30?* ++*Release date: 2015-06-25* + + - Issue #5124: Paste with text selected now replaces the selection on X11. + This matches how paste works on Windows, Mac, most modern Linux apps, +@@ -174,7 +191,7 @@ + Changes are written to HOME/.idlerc/config-extensions.cfg. + Original patch by Tal Einat. + +-- Issue #16233: A module browser (File : Class Browser, Alt+C) requires a ++- Issue #16233: A module browser (File : Class Browser, Alt+C) requires an + editor window with a filename. When Class Browser is requested otherwise, + from a shell, output window, or 'Untitled' editor, Idle no longer displays + an error box. It now pops up an Open Module box (Alt+M). If a valid name +diff -r d33e0cf91556 Lib/idlelib/ParenMatch.py +--- a/Lib/idlelib/ParenMatch.py ++++ b/Lib/idlelib/ParenMatch.py +@@ -9,7 +9,7 @@ + from idlelib.configHandler import idleConf + + _openers = {')':'(',']':'[','}':'{'} +-CHECK_DELAY = 100 # miliseconds ++CHECK_DELAY = 100 # milliseconds + + class ParenMatch: + """Highlight matching parentheses +diff -r d33e0cf91556 Lib/idlelib/ReplaceDialog.py +--- a/Lib/idlelib/ReplaceDialog.py ++++ b/Lib/idlelib/ReplaceDialog.py +@@ -59,7 +59,7 @@ + def default_command(self, event=None): + if self.do_find(self.ok): + if self.do_replace(): # Only find next match if replace succeeded. +- # A bad re can cause a it to fail. ++ # A bad re can cause it to fail. + self.do_find(0) + + def _replace_expand(self, m, repl): +diff -r d33e0cf91556 Lib/idlelib/SearchEngine.py +--- a/Lib/idlelib/SearchEngine.py ++++ b/Lib/idlelib/SearchEngine.py +@@ -107,7 +107,7 @@ + It directly return the result of that call. + + Text is a text widget. Prog is a precompiled pattern. +- The ok parameteris a bit complicated as it has two effects. ++ The ok parameter is a bit complicated as it has two effects. + + If there is a selection, the search begin at either end, + depending on the direction setting and ok, with ok meaning that +diff -r d33e0cf91556 Lib/idlelib/configDialog.py +--- a/Lib/idlelib/configDialog.py ++++ b/Lib/idlelib/configDialog.py +@@ -767,6 +767,7 @@ + if not tkMessageBox.askyesno( + 'Delete Key Set', delmsg % keySetName, parent=self): + return ++ self.DeactivateCurrentConfig() + #remove key set from config + idleConf.userCfg['keys'].remove_section(keySetName) + if keySetName in self.changedItems['keys']: +@@ -785,7 +786,8 @@ + self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys', 'default')) + self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')) + #user can't back out of these changes, they must be applied now +- self.Apply() ++ self.SaveAllChangedConfigs() ++ self.ActivateConfigChanges() + self.SetKeysType() + + def DeleteCustomTheme(self): +@@ -794,6 +796,7 @@ + if not tkMessageBox.askyesno( + 'Delete Theme', delmsg % themeName, parent=self): + return ++ self.DeactivateCurrentConfig() + #remove theme from config + idleConf.userCfg['highlight'].remove_section(themeName) + if themeName in self.changedItems['highlight']: +@@ -812,7 +815,8 @@ + self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme', 'default')) + self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme', 'name')) + #user can't back out of these changes, they must be applied now +- self.Apply() ++ self.SaveAllChangedConfigs() ++ self.ActivateConfigChanges() + self.SetThemeType() + + def GetColour(self): +@@ -1008,7 +1012,8 @@ + pass + ##font size dropdown + self.optMenuFontSize.SetMenu(('7', '8', '9', '10', '11', '12', '13', +- '14', '16', '18', '20', '22'), fontSize ) ++ '14', '16', '18', '20', '22', ++ '25', '29', '34', '40'), fontSize ) + ##fontWeight + self.fontBold.set(fontBold) + ##font sample +diff -r d33e0cf91556 Lib/idlelib/configHandler.py +--- a/Lib/idlelib/configHandler.py ++++ b/Lib/idlelib/configHandler.py +@@ -741,21 +741,32 @@ + idleConf = IdleConf() + + # TODO Revise test output, write expanded unittest +-### module test ++# + if __name__ == '__main__': ++ from zlib import crc32 ++ line, crc = 0, 0 ++ ++ def sprint(obj): ++ global line, crc ++ txt = str(obj) ++ line += 1 ++ crc = crc32(txt.encode(encoding='utf-8'), crc) ++ print(txt) ++ #print('***', line, crc, '***') # uncomment for diagnosis ++ + def dumpCfg(cfg): +- print('\n', cfg, '\n') +- for key in cfg: ++ print('\n', cfg, '\n') # has variable '0xnnnnnnnn' addresses ++ for key in sorted(cfg.keys()): + sections = cfg[key].sections() +- print(key) +- print(sections) ++ sprint(key) ++ sprint(sections) + for section in sections: + options = cfg[key].options(section) +- print(section) +- print(options) ++ sprint(section) ++ sprint(options) + for option in options: +- print(option, '=', cfg[key].Get(section, option)) ++ sprint(option + ' = ' + cfg[key].Get(section, option)) ++ + dumpCfg(idleConf.defaultCfg) + dumpCfg(idleConf.userCfg) +- print(idleConf.userCfg['main'].Get('Theme', 'name')) +- #print(idleConf.userCfg['highlight'].GetDefHighlight('Foo','normal')) ++ print('\nlines = ', line, ', crc = ', crc, sep='') +diff -r d33e0cf91556 Lib/idlelib/help.html +--- a/Lib/idlelib/help.html ++++ b/Lib/idlelib/help.html +@@ -6,7 +6,7 @@ + + + +- 24.6. IDLE — Python 2.7.11 documentation ++ 24.6. IDLE — Python 2.7.12 documentation + + + +@@ -14,7 +14,7 @@ + + + + + +- ++ + + + +@@ -60,7 +60,7 @@ + style="vertical-align: middle; margin-top: -1px"/> +

+

+- Python 2.7.11 documentation » ++ Python 2.7.12 documentation » +

+ +

The Python Standard Library »

+@@ -490,12 +490,12 @@ + functions to be used from IDLE’s Python shell.

+

+

24.6.3.1. Command line usage¶

+-

idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ...
++idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ...
+ 
+ -c command  run command in the shell window
+ -d          enable debugger and open shell window
+ -e          open editor window
+--h          print help message with legal combinatios and exit
++-h          print help message with legal combinations and exit
+ -i          open shell window
+ -r file     run file in shell window
+ -s          run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window
+@@ -527,7 +527,9 @@
+ IDLE’s changes are lost and things like input, raw_input, and
+ print will not work correctly.
+ With IDLE’s Shell, one enters, edits, and recalls complete statements.
+-Some consoles only work with a single physical line at a time.
++Some consoles only work with a single physical line at a time.  IDLE uses
++exec to run each statement.  As a result, '__builtins__' is always
++defined for each statement.
+ 
+ 
+ 24.6.3.3. Running without a subprocess¶
+@@ -688,7 +690,7 @@
+                  style="vertical-align: middle; margin-top: -1px"/>
+         Python »
+         
+-          Python 2.7.11 documentation »
++          Python 2.7.12 documentation »
+         
+ 
+           The Python Standard Library »
+@@ -701,10 +703,10 @@
+     The Python Software Foundation is a non-profit corporation.
+     Please donate.
+     

+-    Last updated on May 02, 2016.
++    Last updated on Aug 30, 2016.
+     Found a bug?
+     

+-    Created using Sphinx 1.3.3.
++    Created using Sphinx 1.3.6.
+     
+ 
+   
+diff -r d33e0cf91556 Lib/idlelib/help.py
+--- a/Lib/idlelib/help.py
++++ b/Lib/idlelib/help.py
+@@ -26,6 +26,7 @@
+ """
+ from HTMLParser import HTMLParser
+ from os.path import abspath, dirname, isdir, isfile, join
++from platform import python_version
+ from Tkinter import Tk, Toplevel, Frame, Text, Scrollbar, Menu, Menubutton
+ import tkFont as tkfont
+ from idlelib.configHandler import idleConf
+@@ -150,7 +151,8 @@
+             self.text.insert('end', d, (self.tags, self.chartags))
+ 
+     def handle_charref(self, name):
+-        self.text.insert('end', unichr(int(name)))
++        if self.show:
++            self.text.insert('end', unichr(int(name)))
+ 
+ 
+ class HelpText(Text):
+@@ -268,7 +270,7 @@
+     if not isfile(filename):
+         # try copy_strip, present message
+         return
+-    HelpWindow(parent, filename, 'IDLE Help')
++    HelpWindow(parent, filename, 'IDLE Help (%s)' % python_version())
+ 
+ if __name__ == '__main__':
+     from idlelib.idle_test.htest import run
+diff -r d33e0cf91556 Lib/idlelib/idle_test/mock_tk.py
+--- a/Lib/idlelib/idle_test/mock_tk.py
++++ b/Lib/idlelib/idle_test/mock_tk.py
+@@ -1,6 +1,6 @@
+ """Classes that replace tkinter gui objects used by an object being tested.
+ 
+-A gui object is anything with a master or parent paramenter, which is
++A gui object is anything with a master or parent parameter, which is
+ typically required in spite of what the doc strings say.
+ """
+ 
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_autocomplete.py
+--- a/Lib/idlelib/idle_test/test_autocomplete.py
++++ b/Lib/idlelib/idle_test/test_autocomplete.py
+@@ -4,7 +4,6 @@
+ 
+ import idlelib.AutoComplete as ac
+ import idlelib.AutoCompleteWindow as acw
+-import idlelib.macosxSupport as mac
+ from idlelib.idle_test.mock_idle import Func
+ from idlelib.idle_test.mock_tk import Event
+ 
+@@ -27,7 +26,6 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
+-        mac.setupApp(cls.root, None)
+         cls.text = Text(cls.root)
+         cls.editor = DummyEditwin(cls.root, cls.text)
+ 
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_configdialog.py
+--- a/Lib/idlelib/idle_test/test_configdialog.py
++++ b/Lib/idlelib/idle_test/test_configdialog.py
+@@ -16,6 +16,7 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
++        cls.root.withdraw()
+         _initializeTkVariantTests(cls.root)
+ 
+     @classmethod
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_editmenu.py
+--- a/Lib/idlelib/idle_test/test_editmenu.py
++++ b/Lib/idlelib/idle_test/test_editmenu.py
+@@ -7,15 +7,18 @@
+ import unittest
+ from idlelib import PyShell
+ 
++
+ class PasteTest(unittest.TestCase):
+     '''Test pasting into widgets that allow pasting.
+ 
+     On X11, replacing selections requires tk fix.
+     '''
++
+     @classmethod
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = root = tk.Tk()
++        root.withdraw()
+         PyShell.fix_x11_paste(root)
+         cls.text = tk.Text(root)
+         cls.entry = tk.Entry(root)
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_hyperparser.py
+--- a/Lib/idlelib/idle_test/test_hyperparser.py
++++ b/Lib/idlelib/idle_test/test_hyperparser.py
+@@ -36,6 +36,7 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
++        cls.root.withdraw()
+         cls.text = Text(cls.root)
+         cls.editwin = DummyEditwin(cls.text)
+ 
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_textview.py
+--- a/Lib/idlelib/idle_test/test_textview.py
++++ b/Lib/idlelib/idle_test/test_textview.py
+@@ -8,7 +8,11 @@
+ from idlelib.idle_test.mock_idle import Func
+ from idlelib.idle_test.mock_tk import Mbox
+ 
+-orig_mbox = tv.tkMessageBox
++
++class TV(tv.TextViewer):  # Use in TextViewTest
++    transient = Func()
++    grab_set = Func()
++    wait_window = Func()
+ 
+ class textviewClassTest(unittest.TestCase):
+ 
+@@ -16,26 +20,19 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
+-        cls.TV = TV = tv.TextViewer
+-        TV.transient = Func()
+-        TV.grab_set = Func()
+-        TV.wait_window = Func()
++        cls.root.withdraw()
+ 
+     @classmethod
+     def tearDownClass(cls):
+-        del cls.TV
+         cls.root.destroy()
+         del cls.root
+ 
+     def setUp(self):
+-        TV = self.TV
+         TV.transient.__init__()
+         TV.grab_set.__init__()
+         TV.wait_window.__init__()
+ 
+-
+     def test_init_modal(self):
+-        TV = self.TV
+         view = TV(self.root, 'Title', 'test text')
+         self.assertTrue(TV.transient.called)
+         self.assertTrue(TV.grab_set.called)
+@@ -43,7 +40,6 @@
+         view.Ok()
+ 
+     def test_init_nonmodal(self):
+-        TV = self.TV
+         view = TV(self.root, 'Title', 'test text', modal=False)
+         self.assertFalse(TV.transient.called)
+         self.assertFalse(TV.grab_set.called)
+@@ -51,32 +47,36 @@
+         view.Ok()
+ 
+     def test_ok(self):
+-        view = self.TV(self.root, 'Title', 'test text', modal=False)
++        view = TV(self.root, 'Title', 'test text', modal=False)
+         view.destroy = Func()
+         view.Ok()
+         self.assertTrue(view.destroy.called)
+-        del view.destroy  # unmask real function
+-        view.destroy
++        del view.destroy  # Unmask the real function.
++        view.destroy()
+ 
+ 
+-class textviewTest(unittest.TestCase):
++class ViewFunctionTest(unittest.TestCase):
+ 
+     @classmethod
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
++        cls.root.withdraw()
++        cls.orig_mbox = tv.tkMessageBox
+         tv.tkMessageBox = Mbox
+ 
+     @classmethod
+     def tearDownClass(cls):
+         cls.root.destroy()
+         del cls.root
+-        tv.tkMessageBox = orig_mbox
++        tv.tkMessageBox = cls.orig_mbox
++        del cls.orig_mbox
+ 
+     def test_view_text(self):
+-        # If modal True, tkinter will error with 'can't invoke "event" command'
++        # If modal True, get tkinter error 'can't invoke "event" command'.
+         view = tv.view_text(self.root, 'Title', 'test text', modal=False)
+         self.assertIsInstance(view, tv.TextViewer)
++        view.Ok()
+ 
+     def test_view_file(self):
+         test_dir = os.path.dirname(__file__)
+@@ -86,10 +86,11 @@
+         self.assertIn('Test', view.textView.get('1.0', '1.end'))
+         view.Ok()
+ 
+-        # Mock messagebox will be used and view_file will not return anything
++        # Mock messagebox will be used; view_file will return None.
+         testfile = os.path.join(test_dir, '../notthere.py')
+         view = tv.view_file(self.root, 'Title', testfile, modal=False)
+         self.assertIsNone(view)
+ 
++
+ if __name__ == '__main__':
+     unittest.main(verbosity=2)
+diff -r d33e0cf91556 Lib/idlelib/idle_test/test_widgetredir.py
+--- a/Lib/idlelib/idle_test/test_widgetredir.py
++++ b/Lib/idlelib/idle_test/test_widgetredir.py
+@@ -15,6 +15,7 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
++        cls.root.withdraw()
+         cls.text = Text(cls.root)
+ 
+     @classmethod
+@@ -44,6 +45,7 @@
+     def setUpClass(cls):
+         requires('gui')
+         cls.root = Tk()
++        cls.root.withdraw()
+         cls.text = Text(cls.root)
+ 
+     @classmethod
+diff -r d33e0cf91556 Lib/io.py
+--- a/Lib/io.py
++++ b/Lib/io.py
+@@ -19,7 +19,7 @@
+ Another IOBase subclass, TextIOBase, deals with the encoding and decoding
+ of streams into text. TextIOWrapper, which extends it, is a buffered text
+ interface to a buffered raw stream (`BufferedIOBase`). Finally, StringIO
+-is a in-memory stream for text.
++is an in-memory stream for text.
+ 
+ Argument names are not part of the specification, and only the arguments
+ of open() are intended to be used as keyword arguments.
+diff -r d33e0cf91556 Lib/json/__init__.py
+--- a/Lib/json/__init__.py
++++ b/Lib/json/__init__.py
+@@ -132,7 +132,7 @@
+     If ``ensure_ascii`` is true (the default), all non-ASCII characters in the
+     output are escaped with ``\uXXXX`` sequences, and the result is a ``str``
+     instance consisting of ASCII characters only.  If ``ensure_ascii`` is
+-    ``False``, some chunks written to ``fp`` may be ``unicode`` instances.
++    false, some chunks written to ``fp`` may be ``unicode`` instances.
+     This usually happens because the input contains unicode strings or the
+     ``encoding`` parameter is used. Unless ``fp.write()`` explicitly
+     understands ``unicode`` (as in ``codecs.getwriter``) this is likely to
+@@ -163,7 +163,7 @@
+     ``default(obj)`` is a function that should return a serializable version
+     of obj or raise TypeError. The default simply raises TypeError.
+ 
+-    If *sort_keys* is ``True`` (default: ``False``), then the output of
++    If *sort_keys* is true (default: ``False``), then the output of
+     dictionaries will be sorted by key.
+ 
+     To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
+@@ -228,7 +228,7 @@
+     ``default(obj)`` is a function that should return a serializable version
+     of obj or raise TypeError. The default simply raises TypeError.
+ 
+-    If *sort_keys* is ``True`` (default: ``False``), then the output of
++    If *sort_keys* is true (default: ``False``), then the output of
+     dictionaries will be sorted by key.
+ 
+     To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
+diff -r d33e0cf91556 Lib/lib-tk/Tix.py
+--- a/Lib/lib-tk/Tix.py
++++ b/Lib/lib-tk/Tix.py
+@@ -26,8 +26,10 @@
+ # appreciate the advantages.
+ #
+ 
++import os
++import Tkinter
+ from Tkinter import *
+-from Tkinter import _flatten, _cnfmerge, _default_root
++from Tkinter import _flatten, _cnfmerge
+ 
+ # WARNING - TkVersion is a limited precision floating point number
+ if TkVersion < 3.999:
+@@ -72,7 +74,6 @@
+ # BEWARE - this is implemented by copying some code from the Widget class
+ #          in Tkinter (to override Widget initialization) and is therefore
+ #          liable to break.
+-import Tkinter, os
+ 
+ # Could probably add this to Tkinter.Misc
+ class tixCommand:
+@@ -476,7 +477,7 @@
+     (multiple) Display Items"""
+ 
+     def __init__(self, itemtype, cnf={}, **kw):
+-        master = _default_root              # global from Tkinter
++        master = Tkinter._default_root
+         if not master and 'refwindow' in cnf: master=cnf['refwindow']
+         elif not master and 'refwindow' in kw:  master= kw['refwindow']
+         elif not master: raise RuntimeError, "Too early to create display style: no root window"
+diff -r d33e0cf91556 Lib/lib-tk/Tkinter.py
+--- a/Lib/lib-tk/Tkinter.py
++++ b/Lib/lib-tk/Tkinter.py
+@@ -302,14 +302,19 @@
+         CBNAME is the name of the callback returned from trace_variable or trace.
+         """
+         self._tk.call("trace", "vdelete", self._name, mode, cbname)
+-        self._tk.deletecommand(cbname)
+-        try:
+-            self._tclCommands.remove(cbname)
+-        except ValueError:
+-            pass
++        cbname = self._tk.splitlist(cbname)[0]
++        for m, ca in self.trace_vinfo():
++            if self._tk.splitlist(ca)[0] == cbname:
++                break
++        else:
++            self._tk.deletecommand(cbname)
++            try:
++                self._tclCommands.remove(cbname)
++            except ValueError:
++                pass
+     def trace_vinfo(self):
+         """Return all trace callback information."""
+-        return map(self._tk.split, self._tk.splitlist(
++        return map(self._tk.splitlist, self._tk.splitlist(
+             self._tk.call("trace", "vinfo", self._name)))
+     def __eq__(self, other):
+         """Comparison for equality (==).
+diff -r d33e0cf91556 Lib/lib-tk/test/test_tkinter/test_variables.py
+--- a/Lib/lib-tk/test/test_tkinter/test_variables.py
++++ b/Lib/lib-tk/test/test_tkinter/test_variables.py
+@@ -1,5 +1,5 @@
+ import unittest
+-
++import gc
+ from Tkinter import (Variable, StringVar, IntVar, DoubleVar, BooleanVar, Tcl,
+                      TclError)
+ 
+@@ -67,6 +67,55 @@
+         with self.assertRaises(ValueError):
+             self.root.setvar('var\x00name', "value")
+ 
++    def test_trace(self):
++        v = Variable(self.root)
++        vname = str(v)
++        trace = []
++        def read_tracer(*args):
++            trace.append(('read',) + args)
++        def write_tracer(*args):
++            trace.append(('write',) + args)
++        cb1 = v.trace_variable('r', read_tracer)
++        cb2 = v.trace_variable('wu', write_tracer)
++        self.assertEqual(sorted(v.trace_vinfo()), [('r', cb1), ('wu', cb2)])
++        self.assertEqual(trace, [])
++
++        v.set('spam')
++        self.assertEqual(trace, [('write', vname, '', 'w')])
++
++        trace = []
++        v.get()
++        self.assertEqual(trace, [('read', vname, '', 'r')])
++
++        trace = []
++        info = sorted(v.trace_vinfo())
++        v.trace_vdelete('w', cb1)  # Wrong mode
++        self.assertEqual(sorted(v.trace_vinfo()), info)
++        with self.assertRaises(TclError):
++            v.trace_vdelete('r', 'spam')  # Wrong command name
++        self.assertEqual(sorted(v.trace_vinfo()), info)
++        v.trace_vdelete('r', (cb1, 43)) # Wrong arguments
++        self.assertEqual(sorted(v.trace_vinfo()), info)
++        v.get()
++        self.assertEqual(trace, [('read', vname, '', 'r')])
++
++        trace = []
++        v.trace_vdelete('r', cb1)
++        self.assertEqual(v.trace_vinfo(), [('wu', cb2)])
++        v.get()
++        self.assertEqual(trace, [])
++
++        trace = []
++        del write_tracer
++        gc.collect()
++        v.set('eggs')
++        self.assertEqual(trace, [('write', vname, '', 'w')])
++
++        #trace = []
++        #del v
++        #gc.collect()
++        #self.assertEqual(trace, [('write', vname, '', 'u')])
++
+ 
+ class TestStringVar(TestBase):
+ 
+diff -r d33e0cf91556 Lib/lib-tk/test/test_ttk/test_widgets.py
+--- a/Lib/lib-tk/test/test_ttk/test_widgets.py
++++ b/Lib/lib-tk/test/test_ttk/test_widgets.py
+@@ -2,7 +2,7 @@
+ import Tkinter as tkinter
+ from Tkinter import TclError
+ import ttk
+-from test.test_support import requires, run_unittest
++from test.test_support import requires, run_unittest, have_unicode, u
+ import sys
+ 
+ from test_functions import MockTclObj
+@@ -1486,6 +1486,60 @@
+             value)
+ 
+ 
++    def test_selection(self):
++        # item 'none' doesn't exist
++        self.assertRaises(tkinter.TclError, self.tv.selection_set, 'none')
++        self.assertRaises(tkinter.TclError, self.tv.selection_add, 'none')
++        self.assertRaises(tkinter.TclError, self.tv.selection_remove, 'none')
++        self.assertRaises(tkinter.TclError, self.tv.selection_toggle, 'none')
++
++        item1 = self.tv.insert('', 'end')
++        item2 = self.tv.insert('', 'end')
++        c1 = self.tv.insert(item1, 'end')
++        c2 = self.tv.insert(item1, 'end')
++        c3 = self.tv.insert(item1, 'end')
++        self.assertEqual(self.tv.selection(), ())
++
++        self.tv.selection_set((c1, item2))
++        self.assertEqual(self.tv.selection(), (c1, item2))
++        self.tv.selection_set(c2)
++        self.assertEqual(self.tv.selection(), (c2,))
++
++        self.tv.selection_add((c1, item2))
++        self.assertEqual(self.tv.selection(), (c1, c2, item2))
++        self.tv.selection_add(item1)
++        self.assertEqual(self.tv.selection(), (item1, c1, c2, item2))
++
++        self.tv.selection_remove((item1, c3))
++        self.assertEqual(self.tv.selection(), (c1, c2, item2))
++        self.tv.selection_remove(c2)
++        self.assertEqual(self.tv.selection(), (c1, item2))
++
++        self.tv.selection_toggle((c1, c3))
++        self.assertEqual(self.tv.selection(), (c3, item2))
++        self.tv.selection_toggle(item2)
++        self.assertEqual(self.tv.selection(), (c3,))
++
++        self.tv.insert('', 'end', id='with spaces')
++        self.tv.selection_set('with spaces')
++        self.assertEqual(self.tv.selection(), ('with spaces',))
++
++        self.tv.insert('', 'end', id='{brace')
++        self.tv.selection_set('{brace')
++        self.assertEqual(self.tv.selection(), ('{brace',))
++
++        if have_unicode:
++            self.tv.insert('', 'end', id=u(r'unicode\u20ac'))
++            self.tv.selection_set(u(r'unicode\u20ac'))
++            self.assertEqual(self.tv.selection(), (u(r'unicode\u20ac'),))
++
++        self.tv.insert('', 'end', id='bytes\xe2\x82\xac')
++        self.tv.selection_set('bytes\xe2\x82\xac')
++        self.assertEqual(self.tv.selection(),
++                         (u(r'bytes\u20ac') if have_unicode else
++                          'bytes\xe2\x82\xac',))
++
++
+     def test_set(self):
+         self.tv['columns'] = ['A', 'B']
+         item = self.tv.insert('', 'end', values=['a', 'b'])
+@@ -1612,5 +1666,9 @@
+         SizegripTest, TreeviewTest, WidgetTest,
+         )
+ 
++tests_gui = (
++        TreeviewTest,
++        )
++
+ if __name__ == "__main__":
+     run_unittest(*tests_gui)
+diff -r d33e0cf91556 Lib/lib-tk/ttk.py
+--- a/Lib/lib-tk/ttk.py
++++ b/Lib/lib-tk/ttk.py
+@@ -153,7 +153,7 @@
+ 
+ def _format_layoutlist(layout, indent=0, indent_size=2):
+     """Formats a layout list so we can pass the result to ttk::style
+-    layout and ttk::style settings. Note that the layout doesn't has to
++    layout and ttk::style settings. Note that the layout doesn't have to
+     be a list necessarily.
+ 
+     E.g.:
+@@ -1394,7 +1394,9 @@
+ 
+     def selection(self, selop=None, items=None):
+         """If selop is not specified, returns selected items."""
+-        return self.tk.call(self._w, "selection", selop, items)
++        if isinstance(items, basestring):
++            items = (items,)
++        return self.tk.splitlist(self.tk.call(self._w, "selection", selop, items))
+ 
+ 
+     def selection_set(self, items):
+diff -r d33e0cf91556 Lib/lib-tk/turtle.py
+--- a/Lib/lib-tk/turtle.py
++++ b/Lib/lib-tk/turtle.py
+@@ -192,7 +192,7 @@
+             continue
+         try:
+             key, value = line.split("=")
+-        except:
++        except ValueError:
+             print "Bad line in config-file %s:\n%s" % (filename,line)
+             continue
+         key = key.strip()
+@@ -205,7 +205,7 @@
+                     value = float(value)
+                 else:
+                     value = int(value)
+-            except:
++            except ValueError:
+                 pass # value need not be converted
+         cfgdict[key] = value
+     return cfgdict
+@@ -234,7 +234,7 @@
+     try:
+         head, tail = split(__file__)
+         cfg_file2 = join(head, default_cfg)
+-    except:
++    except BaseException:
+         cfg_file2 = ""
+     if isfile(cfg_file2):
+         #print "2. Loading config-file %s:" % cfg_file2
+@@ -249,7 +249,7 @@
+ 
+ try:
+     readconfig(_CFG)
+-except:
++except BaseException:
+     print "No configfile read, reason unknown"
+ 
+ 
+@@ -677,7 +677,7 @@
+                     x, y = (self.cv.canvasx(event.x)/self.xscale,
+                            -self.cv.canvasy(event.y)/self.yscale)
+                     fun(x, y)
+-                except:
++                except BaseException:
+                     pass
+             self.cv.tag_bind(item, "" % num, eventfun, add)
+ 
+@@ -1105,7 +1105,7 @@
+                 raise TurtleGraphicsError("bad color string: %s" % str(color))
+         try:
+             r, g, b = color
+-        except:
++        except (TypeError, ValueError):
+             raise TurtleGraphicsError("bad color arguments: %s" % str(color))
+         if self._colormode == 1.0:
+             r, g, b = [round(255.0*x) for x in (r, g, b)]
+@@ -2606,7 +2606,7 @@
+             return args
+         try:
+             r, g, b = args
+-        except:
++        except (TypeError, ValueError):
+             raise TurtleGraphicsError("bad color arguments: %s" % str(args))
+         if self.screen._colormode == 1.0:
+             r, g, b = [round(255.0*x) for x in (r, g, b)]
+@@ -3755,7 +3755,7 @@
+         #print key
+         try:
+             eval(key).im_func.__doc__ = docsdict[key]
+-        except:
++        except BaseException:
+             print "Bad docstring-entry: %s" % key
+ 
+ _LANGUAGE = _CFG["language"]
+@@ -3765,7 +3765,7 @@
+         read_docstrings(_LANGUAGE)
+ except ImportError:
+     print "Cannot find docsdict for", _LANGUAGE
+-except:
++except BaseException:
+     print ("Unknown Error when trying to import %s-docstring-dictionary" %
+                                                                   _LANGUAGE)
+ 
+diff -r d33e0cf91556 Lib/lib2to3/fixes/fix_input.py
+--- a/Lib/lib2to3/fixes/fix_input.py
++++ b/Lib/lib2to3/fixes/fix_input.py
+@@ -17,7 +17,7 @@
+               """
+ 
+     def transform(self, node, results):
+-        # If we're already wrapped in a eval() call, we're done.
++        # If we're already wrapped in an eval() call, we're done.
+         if context.match(node.parent.parent):
+             return
+ 
+diff -r d33e0cf91556 Lib/lib2to3/tests/test_refactor.py
+--- a/Lib/lib2to3/tests/test_refactor.py
++++ b/Lib/lib2to3/tests/test_refactor.py
+@@ -8,6 +8,7 @@
+ import os
+ import codecs
+ import operator
++import re
+ import StringIO
+ import tempfile
+ import shutil
+@@ -226,8 +227,8 @@
+                                     actually_write=False)
+         # Testing that it logged this message when write=False was passed is
+         # sufficient to see that it did not bail early after "No changes".
+-        message_regex = r"Not writing changes to .*%s%s" % (
+-                os.sep, os.path.basename(test_file))
++        message_regex = r"Not writing changes to .*%s" % \
++                re.escape(os.sep + os.path.basename(test_file))
+         for message in debug_messages:
+             if "Not writing changes" in message:
+                 self.assertRegexpMatches(message, message_regex)
+diff -r d33e0cf91556 Lib/msilib/schema.py
+--- a/Lib/msilib/schema.py
++++ b/Lib/msilib/schema.py
+@@ -733,7 +733,7 @@
+ (u'CustomAction',u'Source',u'Y',None, None, None, None, u'CustomSource',None, u'The table reference of the source of the code.',),
+ (u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Execution parameter, depends on the type of custom action',),
+ (u'DrLocator',u'Signature_',u'N',None, None, None, None, u'Identifier',None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.',),
+-(u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',),
++(u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',),
+ (u'DrLocator',u'Depth',u'Y',0,32767,None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.',),
+ (u'DrLocator',u'Parent',u'Y',None, None, None, None, u'Identifier',None, u'The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.',),
+ (u'DuplicateFile',u'File_',u'N',None, None, u'File',1,u'Identifier',None, u'Foreign key referencing the source file to be duplicated.',),
+diff -r d33e0cf91556 Lib/plat-mac/findertools.py
+--- a/Lib/plat-mac/findertools.py
++++ b/Lib/plat-mac/findertools.py
+@@ -580,7 +580,7 @@
+ 
+ def mountvolume(volume, server=None, username=None, password=None):
+     """mount a volume, local or on a server on AppleTalk.
+-    Note: mounting a ASIP server requires a different operation.
++    Note: mounting an ASIP server requires a different operation.
+     server is the name of the server where the volume belongs
+     username, password belong to a registered user of the volume."""
+     finder = _getfinder()
+diff -r d33e0cf91556 Lib/plat-mac/macresource.py
+--- a/Lib/plat-mac/macresource.py
++++ b/Lib/plat-mac/macresource.py
+@@ -78,7 +78,7 @@
+     """Open a resource file given by pathname, possibly decoding an
+     AppleSingle file"""
+     # No resource fork. We may be on OSX, and this may be either
+-    # a data-fork based resource file or a AppleSingle file
++    # a data-fork based resource file or an AppleSingle file
+     # from the CVS repository.
+     try:
+         refno = Res.FSOpenResourceFile(pathname, u'', 1)
+@@ -97,7 +97,7 @@
+     If the pathname given already refers to such a file simply return it,
+     otherwise first decode it."""
+     # No resource fork. We may be on OSX, and this may be either
+-    # a data-fork based resource file or a AppleSingle file
++    # a data-fork based resource file or an AppleSingle file
+     # from the CVS repository.
+     try:
+         refno = Res.FSOpenResourceFile(pathname, u'', 1)
+diff -r d33e0cf91556 Lib/platform.py
+--- a/Lib/platform.py
++++ b/Lib/platform.py
+@@ -63,7 +63,7 @@
+ #            though
+ #    0.5.2 - fixed uname() to return '' instead of 'unknown' in all
+ #            return values (the system uname command tends to return
+-#            'unknown' instead of just leaving the field emtpy)
++#            'unknown' instead of just leaving the field empty)
+ #    0.5.1 - included code for slackware dist; added exception handlers
+ #            to cover up situations where platforms don't have os.popen
+ #            (e.g. Mac) or fail on socket.gethostname(); fixed libc
+diff -r d33e0cf91556 Lib/posixpath.py
+--- a/Lib/posixpath.py
++++ b/Lib/posixpath.py
+@@ -186,7 +186,7 @@
+         return False
+     try:
+         s1 = os.lstat(path)
+-        s2 = os.lstat(join(path, '..'))
++        s2 = os.lstat(realpath(join(path, '..')))
+     except os.error:
+         return False # It doesn't exist -- so not a mount point :-)
+     dev1 = s1.st_dev
+diff -r d33e0cf91556 Lib/pydoc.py
+--- a/Lib/pydoc.py
++++ b/Lib/pydoc.py
+@@ -28,7 +28,7 @@
+ 
+ Module docs for core modules are assumed to be in
+ 
+-    http://docs.python.org/library/
++    https://docs.python.org/library/
+ 
+ This can be overridden by setting the PYTHONDOCS environment variable
+ to a different URL or to a local directory containing the Library
+@@ -374,7 +374,9 @@
+ 
+     docmodule = docclass = docroutine = docother = docproperty = docdata = fail
+ 
+-    def getdocloc(self, object):
++    def getdocloc(self, object,
++                  basedir=os.path.join(sys.exec_prefix, "lib",
++                                       "python"+sys.version[0:3])):
+         """Return the location of module docs or None"""
+ 
+         try:
+@@ -383,9 +385,8 @@
+             file = '(built-in)'
+ 
+         docloc = os.environ.get("PYTHONDOCS",
+-                                "http://docs.python.org/library")
+-        basedir = os.path.join(sys.exec_prefix, "lib",
+-                               "python"+sys.version[0:3])
++                                "https://docs.python.org/library")
++        basedir = os.path.normcase(basedir)
+         if (isinstance(object, type(os)) and
+             (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
+                                  'marshal', 'posix', 'signal', 'sys',
+@@ -393,10 +394,10 @@
+              (file.startswith(basedir) and
+               not file.startswith(os.path.join(basedir, 'site-packages')))) and
+             object.__name__ not in ('xml.etree', 'test.pydoc_mod')):
+-            if docloc.startswith("http://"):
+-                docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
++            if docloc.startswith(("http://", "https://")):
++                docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__.lower())
+             else:
+-                docloc = os.path.join(docloc, object.__name__ + ".html")
++                docloc = os.path.join(docloc, object.__name__.lower() + ".html")
+         else:
+             docloc = None
+         return docloc
+diff -r d33e0cf91556 Lib/shlex.py
+--- a/Lib/shlex.py
++++ b/Lib/shlex.py
+@@ -230,7 +230,7 @@
+                     if self.debug >= 2:
+                         print "shlex: I see punctuation in word state"
+                     self.state = ' '
+-                    if self.token:
++                    if self.token or (self.posix and quoted):
+                         break   # emit current token
+                     else:
+                         continue
+diff -r d33e0cf91556 Lib/sqlite3/test/factory.py
+--- a/Lib/sqlite3/test/factory.py
++++ b/Lib/sqlite3/test/factory.py
+@@ -58,8 +58,20 @@
+         self.con.close()
+ 
+     def CheckIsInstance(self):
+-        cur = self.con.cursor(factory=MyCursor)
++        cur = self.con.cursor()
++        self.assertIsInstance(cur, sqlite.Cursor)
++        cur = self.con.cursor(MyCursor)
+         self.assertIsInstance(cur, MyCursor)
++        cur = self.con.cursor(factory=lambda con: MyCursor(con))
++        self.assertIsInstance(cur, MyCursor)
++
++    def CheckInvalidFactory(self):
++        # not a callable at all
++        self.assertRaises(TypeError, self.con.cursor, None)
++        # invalid callable with not exact one argument
++        self.assertRaises(TypeError, self.con.cursor, lambda: None)
++        # invalid callable returning non-cursor
++        self.assertRaises(TypeError, self.con.cursor, lambda con: None)
+ 
+ class RowFactoryTestsBackwardsCompat(unittest.TestCase):
+     def setUp(self):
+@@ -173,10 +185,12 @@
+     def CheckFakeCursorClass(self):
+         # Issue #24257: Incorrect use of PyObject_IsInstance() caused
+         # segmentation fault.
++        # Issue #27861: Also applies for cursor factory.
+         class FakeCursor(str):
+             __class__ = sqlite.Cursor
+-        cur = self.con.cursor(factory=FakeCursor)
+-        self.assertRaises(TypeError, sqlite.Row, cur, ())
++        self.con.row_factory = sqlite.Row
++        self.assertRaises(TypeError, self.con.cursor, FakeCursor)
++        self.assertRaises(TypeError, sqlite.Row, FakeCursor(), ())
+ 
+     def tearDown(self):
+         self.con.close()
+diff -r d33e0cf91556 Lib/sqlite3/test/regression.py
+--- a/Lib/sqlite3/test/regression.py
++++ b/Lib/sqlite3/test/regression.py
+@@ -118,7 +118,7 @@
+ 
+     def CheckUnicodeConnect(self):
+         """
+-        With pysqlite 2.4.0 you needed to use a string or a APSW connection
++        With pysqlite 2.4.0 you needed to use a string or an APSW connection
+         object for opening database connections.
+ 
+         Formerly, both bytestrings and unicode strings used to work.
+@@ -328,6 +328,36 @@
+         self.assertRaises(ValueError, cur.execute, " \0select 2")
+         self.assertRaises(ValueError, cur.execute, "select 2\0")
+ 
++    def CheckCommitCursorReset(self):
++        """
++        Connection.commit() did reset cursors, which made sqlite3
++        to return rows multiple times when fetched from cursors
++        after commit. See issues 10513 and 23129 for details.
++        """
++        con = sqlite.connect(":memory:")
++        con.executescript("""
++        create table t(c);
++        create table t2(c);
++        insert into t values(0);
++        insert into t values(1);
++        insert into t values(2);
++        """)
++
++        self.assertEqual(con.isolation_level, "")
++
++        counter = 0
++        for i, row in enumerate(con.execute("select c from t")):
++            con.execute("insert into t2(c) values (?)", (i,))
++            con.commit()
++            if counter == 0:
++                self.assertEqual(row[0], 0)
++            elif counter == 1:
++                self.assertEqual(row[0], 1)
++            elif counter == 2:
++                self.assertEqual(row[0], 2)
++            counter += 1
++        self.assertEqual(counter, 3, "should have returned exactly three rows")
++
+ 
+ def suite():
+     regression_suite = unittest.makeSuite(RegressionTests, "Check")
+diff -r d33e0cf91556 Lib/test/_mock_backport.py
+--- a/Lib/test/_mock_backport.py
++++ b/Lib/test/_mock_backport.py
+@@ -740,7 +740,7 @@
+ 
+     def _call_matcher(self, _call):
+         """
+-        Given a call (or simply a (args, kwargs) tuple), return a
++        Given a call (or simply an (args, kwargs) tuple), return a
+         comparison key suitable for matching with other calls.
+         This is a best effort method which relies on the spec's signature,
+         if available, or falls back on the arguments themselves.
+diff -r d33e0cf91556 Lib/test/decimaltestdata/exp.decTest
+--- a/Lib/test/decimaltestdata/exp.decTest
++++ b/Lib/test/decimaltestdata/exp.decTest
+@@ -19,7 +19,7 @@
+ ------------------------------------------------------------------------
+ version: 2.59
+ 
+--- Tests of the exponential funtion.  Currently all testcases here
++-- Tests of the exponential function.  Currently all testcases here
+ -- show results which are correctly rounded (within <= 0.5 ulp).
+ 
+ extended:    1
+diff -r d33e0cf91556 Lib/test/decimaltestdata/fma.decTest
+--- a/Lib/test/decimaltestdata/fma.decTest
++++ b/Lib/test/decimaltestdata/fma.decTest
+@@ -148,7 +148,7 @@
+ fmax2019 fma -9.999999  9.999999  0E+999999  -> -100.000 Inexact Rounded
+ fmax2020 fma -9.999999 -9.999999  0E+999999  ->  100.000 Inexact Rounded
+ 
+--- 1999.12.21: next one is a edge case if intermediate longs are used
++-- 1999.12.21: next one is an edge case if intermediate longs are used
+ precision: 15
+ fmax2059 fma 999999999999 9765625  0E+999999  -> 9.76562499999023E+18 Inexact Rounded
+ precision: 30
+diff -r d33e0cf91556 Lib/test/decimaltestdata/multiply.decTest
+--- a/Lib/test/decimaltestdata/multiply.decTest
++++ b/Lib/test/decimaltestdata/multiply.decTest
+@@ -49,7 +49,7 @@
+ mulx019 multiply -9.999999999  9.999999999 -> -100.000 Inexact Rounded
+ mulx020 multiply -9.999999999 -9.999999999 ->  100.000 Inexact Rounded
+ 
+--- 1999.12.21: next one is a edge case if intermediate longs are used
++-- 1999.12.21: next one is an edge case if intermediate longs are used
+ precision: 15
+ mulx059 multiply 999999999999 9765625 -> 9.76562499999023E+18 Inexact Rounded
+ precision: 30
+diff -r d33e0cf91556 Lib/test/test_cookielib.py
+--- a/Lib/test/test_cookielib.py
++++ b/Lib/test/test_cookielib.py
+@@ -6,6 +6,7 @@
+ import re
+ import time
+ 
++from cookielib import http2time, time2isoz, time2netscape
+ from unittest import TestCase
+ 
+ from test import test_support
+@@ -14,8 +15,6 @@
+ class DateTimeTests(TestCase):
+ 
+     def test_time2isoz(self):
+-        from cookielib import time2isoz
+-
+         base = 1019227000
+         day = 24*3600
+         self.assertEqual(time2isoz(base), "2002-04-19 14:36:40Z")
+@@ -30,9 +29,29 @@
+                                      r"^\d{4}-\d\d-\d\d \d\d:\d\d:\d\dZ$",
+                                      "bad time2isoz format: %s %s" % (az, bz))
+ 
++    def test_time2netscape(self):
++        base = 1019227000
++        day = 24*3600
++        self.assertEqual(time2netscape(base), "Fri, 19-Apr-2002 14:36:40 GMT")
++        self.assertEqual(time2netscape(base+day),
++                         "Sat, 20-Apr-2002 14:36:40 GMT")
++
++        self.assertEqual(time2netscape(base+2*day),
++                         "Sun, 21-Apr-2002 14:36:40 GMT")
++
++        self.assertEqual(time2netscape(base+3*day),
++                         "Mon, 22-Apr-2002 14:36:40 GMT")
++
++        az = time2netscape()
++        bz = time2netscape(500000)
++        for text in (az, bz):
++            # Format "%s, %02d-%s-%04d %02d:%02d:%02d GMT"
++            self.assertRegexpMatches(
++                text,
++                r"[a-zA-Z]{3}, \d{2}-[a-zA-Z]{3}-\d{4} \d{2}:\d{2}:\d{2} GMT$",
++                "bad time2netscape format: %s %s" % (az, bz))
++
+     def test_http2time(self):
+-        from cookielib import http2time
+-
+         def parse_date(text):
+             return time.gmtime(http2time(text))[:6]
+ 
+@@ -45,7 +64,7 @@
+         self.assertEqual(parse_date("03-Feb-98"), (1998, 2, 3, 0, 0, 0.0))
+ 
+     def test_http2time_formats(self):
+-        from cookielib import http2time, time2isoz
++
+ 
+         # test http2time for supported dates.  Test cases with 2 digit year
+         # will probably break in year 2044.
+@@ -81,8 +100,6 @@
+             self.assertEqual(http2time(s.upper()), test_t, s.upper())
+ 
+     def test_http2time_garbage(self):
+-        from cookielib import http2time
+-
+         for test in [
+             '',
+             'Garbage',
+@@ -329,7 +346,7 @@
+ ##   comma-separated list, it'll be a headache to parse (at least my head
+ ##   starts hurting every time I think of that code).
+ ## - Expires: You'll get all sorts of date formats in the expires,
+-##   including emtpy expires attributes ("expires="). Be as flexible as you
++##   including empty expires attributes ("expires="). Be as flexible as you
+ ##   can, and certainly don't expect the weekday to be there; if you can't
+ ##   parse it, just ignore it and pretend it's a session cookie.
+ ## - Domain-matching: Netscape uses the 2-dot rule for _all_ domains, not
+diff -r d33e0cf91556 Lib/test/test_curses.py
+--- a/Lib/test/test_curses.py
++++ b/Lib/test/test_curses.py
+@@ -10,6 +10,7 @@
+ #
+ 
+ import os
++import string
+ import sys
+ import tempfile
+ import unittest
+@@ -184,6 +185,11 @@
+         if hasattr(curses, 'enclose'):
+             stdscr.enclose()
+ 
++        self.assertRaises(ValueError, stdscr.getstr, -400)
++        self.assertRaises(ValueError, stdscr.getstr, 2, 3, -400)
++        self.assertRaises(ValueError, stdscr.instr, -2)
++        self.assertRaises(ValueError, stdscr.instr, 2, 3, -2)
++
+ 
+     def test_module_funcs(self):
+         "Test module-level functions"
+@@ -324,6 +330,53 @@
+ 
+ class TestAscii(unittest.TestCase):
+ 
++    def test_controlnames(self):
++        for name in curses.ascii.controlnames:
++            self.assertTrue(hasattr(curses.ascii, name), name)
++
++    def test_ctypes(self):
++        def check(func, expected):
++            self.assertEqual(func(i), expected)
++            self.assertEqual(func(c), expected)
++
++        for i in range(256):
++            c = b = chr(i)
++            check(curses.ascii.isalnum, b.isalnum())
++            check(curses.ascii.isalpha, b.isalpha())
++            check(curses.ascii.isdigit, b.isdigit())
++            check(curses.ascii.islower, b.islower())
++            check(curses.ascii.isspace, b.isspace())
++            check(curses.ascii.isupper, b.isupper())
++
++            check(curses.ascii.isascii, i < 128)
++            check(curses.ascii.ismeta, i >= 128)
++            check(curses.ascii.isctrl, i < 32)
++            check(curses.ascii.iscntrl, i < 32 or i == 127)
++            check(curses.ascii.isblank, c in ' \t')
++            check(curses.ascii.isgraph, 32 < i <= 126)
++            check(curses.ascii.isprint, 32 <= i <= 126)
++            check(curses.ascii.ispunct, c in string.punctuation)
++            check(curses.ascii.isxdigit, c in string.hexdigits)
++
++    def test_ascii(self):
++        ascii = curses.ascii.ascii
++        self.assertEqual(ascii('\xc1'), 'A')
++        self.assertEqual(ascii('A'), 'A')
++        self.assertEqual(ascii(ord('\xc1')), ord('A'))
++
++    def test_ctrl(self):
++        ctrl = curses.ascii.ctrl
++        self.assertEqual(ctrl('J'), '\n')
++        self.assertEqual(ctrl('\n'), '\n')
++        self.assertEqual(ctrl('@'), '\0')
++        self.assertEqual(ctrl(ord('J')), ord('\n'))
++
++    def test_alt(self):
++        alt = curses.ascii.alt
++        self.assertEqual(alt('\n'), '\x8a')
++        self.assertEqual(alt('A'), '\xc1')
++        self.assertEqual(alt(ord('A')), 0xc1)
++
+     def test_unctrl(self):
+         unctrl = curses.ascii.unctrl
+         self.assertEqual(unctrl('a'), 'a')
+@@ -333,9 +386,13 @@
+         self.assertEqual(unctrl('\x7f'), '^?')
+         self.assertEqual(unctrl('\n'), '^J')
+         self.assertEqual(unctrl('\0'), '^@')
++        self.assertEqual(unctrl(ord('A')), 'A')
++        self.assertEqual(unctrl(ord('\n')), '^J')
+         # Meta-bit characters
+         self.assertEqual(unctrl('\x8a'), '!^J')
+         self.assertEqual(unctrl('\xc1'), '!A')
++        self.assertEqual(unctrl(ord('\x8a')), '!^J')
++        self.assertEqual(unctrl(ord('\xc1')), '!A')
+ 
+ 
+ def test_main():
+diff -r d33e0cf91556 Lib/test/test_deque.py
+--- a/Lib/test/test_deque.py
++++ b/Lib/test/test_deque.py
+@@ -329,7 +329,7 @@
+         d.clear()
+         self.assertEqual(len(d), 0)
+         self.assertEqual(list(d), [])
+-        d.clear()               # clear an emtpy deque
++        d.clear()               # clear an empty deque
+         self.assertEqual(list(d), [])
+ 
+     def test_remove(self):
+diff -r d33e0cf91556 Lib/test/test_doctest.py
+--- a/Lib/test/test_doctest.py
++++ b/Lib/test/test_doctest.py
+@@ -2113,7 +2113,7 @@
+          ...
+          AttributeError: 'module' object has no attribute 'sillySetup'
+ 
+-       The setUp and tearDown funtions are passed test objects. Here
++       The setUp and tearDown functions are passed test objects. Here
+        we'll use the setUp function to supply the missing variable y:
+ 
+          >>> def setUp(test):
+@@ -2259,7 +2259,7 @@
+          ...
+          AttributeError: 'module' object has no attribute 'sillySetup'
+ 
+-       The setUp and tearDown funtions are passed test objects.
++       The setUp and tearDown functions are passed test objects.
+        Here, we'll use a setUp function to set the favorite color in
+        test_doctest.txt:
+ 
+diff -r d33e0cf91556 Lib/test/test_docxmlrpc.py
+--- a/Lib/test/test_docxmlrpc.py
++++ b/Lib/test/test_docxmlrpc.py
+@@ -3,12 +3,8 @@
+ import sys
+ from test import test_support
+ threading = test_support.import_module('threading')
+-import time
+-import socket
+ import unittest
+ 
+-PORT = None
+-
+ def make_request_and_skipIf(condition, reason):
+     # If we skip the test, we have to make a request because
+     # the server created in setUp blocks expecting one to come in.
+@@ -23,13 +19,10 @@
+     return decorator
+ 
+ 
+-def server(evt, numrequests):
++def make_server():
+     serv = DocXMLRPCServer(("localhost", 0), logRequests=False)
+ 
+     try:
+-        global PORT
+-        PORT = serv.socket.getsockname()[1]
+-
+         # Add some documentation
+         serv.set_server_title("DocXMLRPCServer Test Documentation")
+         serv.set_server_name("DocXMLRPCServer Test Docs")
+@@ -56,42 +49,31 @@
+ 
+         serv.register_function(add)
+         serv.register_function(lambda x, y: x-y)
+-
+-        while numrequests > 0:
+-            serv.handle_request()
+-            numrequests -= 1
+-    except socket.timeout:
+-        pass
+-    finally:
++        return serv
++    except:
+         serv.server_close()
+-        PORT = None
+-        evt.set()
++        raise
+ 
+ class DocXMLRPCHTTPGETServer(unittest.TestCase):
+     def setUp(self):
+-        self._threads = test_support.threading_setup()
+         # Enable server feedback
+         DocXMLRPCServer._send_traceback_header = True
+ 
+-        self.evt = threading.Event()
+-        threading.Thread(target=server, args=(self.evt, 1)).start()
++        self.serv = make_server()
++        self.thread = threading.Thread(target=self.serv.serve_forever)
++        self.thread.start()
+ 
+-        # wait for port to be assigned
+-        n = 1000
+-        while n > 0 and PORT is None:
+-            time.sleep(0.001)
+-            n -= 1
+-
++        PORT = self.serv.server_address[1]
+         self.client = httplib.HTTPConnection("localhost:%d" % PORT)
+ 
+     def tearDown(self):
+         self.client.close()
+ 
+-        self.evt.wait()
+-
+         # Disable server feedback
+         DocXMLRPCServer._send_traceback_header = False
+-        test_support.threading_cleanup(*self._threads)
++        self.serv.shutdown()
++        self.thread.join()
++        self.serv.server_close()
+ 
+     def test_valid_get_response(self):
+         self.client.request("GET", "/")
+@@ -153,7 +135,7 @@
+     @make_request_and_skipIf(sys.flags.optimize >= 2,
+                      "Docstrings are omitted with -O2 and above")
+     def test_system_methods(self):
+-        """Test the precense of three consecutive system.* methods.
++        """Test the presence of three consecutive system.* methods.
+ 
+         This also tests their use of parameter type recognition and the
+         systems related to that process.
+diff -r d33e0cf91556 Lib/test/test_fileio.py
+--- a/Lib/test/test_fileio.py
++++ b/Lib/test/test_fileio.py
+@@ -361,6 +361,11 @@
+         finally:
+             os.unlink(TESTFN)
+ 
++    def testConstructorHandlesNULChars(self):
++        fn_with_NUL = 'foo\0bar'
++        self.assertRaises(TypeError, _FileIO, fn_with_NUL, 'w')
++        self.assertRaises(TypeError, _FileIO, fn_with_NUL.encode('ascii'), 'w')
++
+     def testInvalidFd(self):
+         self.assertRaises(ValueError, _FileIO, -10)
+         self.assertRaises(OSError, _FileIO, make_bad_fd())
+diff -r d33e0cf91556 Lib/test/test_functools.py
+--- a/Lib/test/test_functools.py
++++ b/Lib/test/test_functools.py
+@@ -38,17 +38,17 @@
+ 
+ class TestPartial(unittest.TestCase):
+ 
+-    thetype = functools.partial
++    partial = functools.partial
+ 
+     def test_basic_examples(self):
+-        p = self.thetype(capture, 1, 2, a=10, b=20)
++        p = self.partial(capture, 1, 2, a=10, b=20)
+         self.assertEqual(p(3, 4, b=30, c=40),
+                          ((1, 2, 3, 4), dict(a=10, b=30, c=40)))
+-        p = self.thetype(map, lambda x: x*10)
++        p = self.partial(map, lambda x: x*10)
+         self.assertEqual(p([1,2,3,4]), [10, 20, 30, 40])
+ 
+     def test_attributes(self):
+-        p = self.thetype(capture, 1, 2, a=10, b=20)
++        p = self.partial(capture, 1, 2, a=10, b=20)
+         # attributes should be readable
+         self.assertEqual(p.func, capture)
+         self.assertEqual(p.args, (1, 2))
+@@ -58,7 +58,7 @@
+         self.assertRaises(TypeError, setattr, p, 'args', (1, 2))
+         self.assertRaises(TypeError, setattr, p, 'keywords', dict(a=1, b=2))
+ 
+-        p = self.thetype(hex)
++        p = self.partial(hex)
+         try:
+             del p.__dict__
+         except TypeError:
+@@ -67,9 +67,9 @@
+             self.fail('partial object allowed __dict__ to be deleted')
+ 
+     def test_argument_checking(self):
+-        self.assertRaises(TypeError, self.thetype)     # need at least a func arg
++        self.assertRaises(TypeError, self.partial)     # need at least a func arg
+         try:
+-            self.thetype(2)()
++            self.partial(2)()
+         except TypeError:
+             pass
+         else:
+@@ -80,7 +80,7 @@
+         def func(a=10, b=20):
+             return a
+         d = {'a':3}
+-        p = self.thetype(func, a=5)
++        p = self.partial(func, a=5)
+         self.assertEqual(p(**d), 3)
+         self.assertEqual(d, {'a':3})
+         p(b=7)
+@@ -89,21 +89,21 @@
+     def test_arg_combinations(self):
+         # exercise special code paths for zero args in either partial
+         # object or the caller
+-        p = self.thetype(capture)
++        p = self.partial(capture)
+         self.assertEqual(p(), ((), {}))
+         self.assertEqual(p(1,2), ((1,2), {}))
+-        p = self.thetype(capture, 1, 2)
++        p = self.partial(capture, 1, 2)
+         self.assertEqual(p(), ((1,2), {}))
+         self.assertEqual(p(3,4), ((1,2,3,4), {}))
+ 
+     def test_kw_combinations(self):
+         # exercise special code paths for no keyword args in
+         # either the partial object or the caller
+-        p = self.thetype(capture)
++        p = self.partial(capture)
+         self.assertEqual(p.keywords, {})
+         self.assertEqual(p(), ((), {}))
+         self.assertEqual(p(a=1), ((), {'a':1}))
+-        p = self.thetype(capture, a=1)
++        p = self.partial(capture, a=1)
+         self.assertEqual(p.keywords, {'a':1})
+         self.assertEqual(p(), ((), {'a':1}))
+         self.assertEqual(p(b=2), ((), {'a':1, 'b':2}))
+@@ -113,7 +113,7 @@
+     def test_positional(self):
+         # make sure positional arguments are captured correctly
+         for args in [(), (0,), (0,1), (0,1,2), (0,1,2,3)]:
+-            p = self.thetype(capture, *args)
++            p = self.partial(capture, *args)
+             expected = args + ('x',)
+             got, empty = p('x')
+             self.assertTrue(expected == got and empty == {})
+@@ -121,14 +121,14 @@
+     def test_keyword(self):
+         # make sure keyword arguments are captured correctly
+         for a in ['a', 0, None, 3.5]:
+-            p = self.thetype(capture, a=a)
++            p = self.partial(capture, a=a)
+             expected = {'a':a,'x':None}
+             empty, got = p(x=None)
+             self.assertTrue(expected == got and empty == ())
+ 
+     def test_no_side_effects(self):
+         # make sure there are no side effects that affect subsequent calls
+-        p = self.thetype(capture, 0, a=1)
++        p = self.partial(capture, 0, a=1)
+         args1, kw1 = p(1, b=2)
+         self.assertTrue(args1 == (0,1) and kw1 == {'a':1,'b':2})
+         args2, kw2 = p()
+@@ -137,13 +137,13 @@
+     def test_error_propagation(self):
+         def f(x, y):
+             x // y
+-        self.assertRaises(ZeroDivisionError, self.thetype(f, 1, 0))
+-        self.assertRaises(ZeroDivisionError, self.thetype(f, 1), 0)
+-        self.assertRaises(ZeroDivisionError, self.thetype(f), 1, 0)
+-        self.assertRaises(ZeroDivisionError, self.thetype(f, y=0), 1)
++        self.assertRaises(ZeroDivisionError, self.partial(f, 1, 0))
++        self.assertRaises(ZeroDivisionError, self.partial(f, 1), 0)
++        self.assertRaises(ZeroDivisionError, self.partial(f), 1, 0)
++        self.assertRaises(ZeroDivisionError, self.partial(f, y=0), 1)
+ 
+     def test_weakref(self):
+-        f = self.thetype(int, base=16)
++        f = self.partial(int, base=16)
+         p = proxy(f)
+         self.assertEqual(f.func, p.func)
+         f = None
+@@ -151,20 +151,20 @@
+ 
+     def test_with_bound_and_unbound_methods(self):
+         data = map(str, range(10))
+-        join = self.thetype(str.join, '')
++        join = self.partial(str.join, '')
+         self.assertEqual(join(data), '0123456789')
+-        join = self.thetype(''.join)
++        join = self.partial(''.join)
+         self.assertEqual(join(data), '0123456789')
+ 
+     def test_pickle(self):
+-        f = self.thetype(signature, ['asdf'], bar=[True])
++        f = self.partial(signature, ['asdf'], bar=[True])
+         f.attr = []
+         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+             f_copy = pickle.loads(pickle.dumps(f, proto))
+             self.assertEqual(signature(f_copy), signature(f))
+ 
+     def test_copy(self):
+-        f = self.thetype(signature, ['asdf'], bar=[True])
++        f = self.partial(signature, ['asdf'], bar=[True])
+         f.attr = []
+         f_copy = copy.copy(f)
+         self.assertEqual(signature(f_copy), signature(f))
+@@ -173,7 +173,7 @@
+         self.assertIs(f_copy.keywords, f.keywords)
+ 
+     def test_deepcopy(self):
+-        f = self.thetype(signature, ['asdf'], bar=[True])
++        f = self.partial(signature, ['asdf'], bar=[True])
+         f.attr = []
+         f_copy = copy.deepcopy(f)
+         self.assertEqual(signature(f_copy), signature(f))
+@@ -184,7 +184,7 @@
+         self.assertIsNot(f_copy.keywords['bar'], f.keywords['bar'])
+ 
+     def test_setstate(self):
+-        f = self.thetype(signature)
++        f = self.partial(signature)
+         f.__setstate__((capture, (1,), dict(a=10), dict(attr=[])))
+         self.assertEqual(signature(f),
+                          (capture, (1,), dict(a=10), dict(attr=[])))
+@@ -207,7 +207,7 @@
+         self.assertEqual(f(), ((), {}))
+ 
+     def test_setstate_errors(self):
+-        f = self.thetype(signature)
++        f = self.partial(signature)
+         self.assertRaises(TypeError, f.__setstate__, (capture, (), {}))
+         self.assertRaises(TypeError, f.__setstate__, (capture, (), {}, {}, None))
+         self.assertRaises(TypeError, f.__setstate__, [capture, (), {}, None])
+@@ -217,7 +217,7 @@
+         self.assertRaises(TypeError, f.__setstate__, (capture, (), [], None))
+ 
+     def test_setstate_subclasses(self):
+-        f = self.thetype(signature)
++        f = self.partial(signature)
+         f.__setstate__((capture, MyTuple((1,)), MyDict(a=10), None))
+         s = signature(f)
+         self.assertEqual(s, (capture, (1,), dict(a=10), {}))
+@@ -236,6 +236,40 @@
+         self.assertEqual(r, ((1, 2), {}))
+         self.assertIs(type(r[0]), tuple)
+ 
++    def test_recursive_pickle(self):
++        f = self.partial(capture)
++        f.__setstate__((f, (), {}, {}))
++        try:
++            for proto in range(pickle.HIGHEST_PROTOCOL + 1):
++                with self.assertRaises(RuntimeError):
++                    pickle.dumps(f, proto)
++        finally:
++            f.__setstate__((capture, (), {}, {}))
++
++        f = self.partial(capture)
++        f.__setstate__((capture, (f,), {}, {}))
++        try:
++            for proto in range(pickle.HIGHEST_PROTOCOL + 1):
++                f_copy = pickle.loads(pickle.dumps(f, proto))
++                try:
++                    self.assertIs(f_copy.args[0], f_copy)
++                finally:
++                    f_copy.__setstate__((capture, (), {}, {}))
++        finally:
++            f.__setstate__((capture, (), {}, {}))
++
++        f = self.partial(capture)
++        f.__setstate__((capture, (), {'a': f}, {}))
++        try:
++            for proto in range(pickle.HIGHEST_PROTOCOL + 1):
++                f_copy = pickle.loads(pickle.dumps(f, proto))
++                try:
++                    self.assertIs(f_copy.keywords['a'], f_copy)
++                finally:
++                    f_copy.__setstate__((capture, (), {}, {}))
++        finally:
++            f.__setstate__((capture, (), {}, {}))
++
+     # Issue 6083: Reference counting bug
+     def test_setstate_refcount(self):
+         class BadSequence:
+@@ -250,7 +284,7 @@
+                     return {}
+                 raise IndexError
+ 
+-        f = self.thetype(object)
++        f = self.partial(object)
+         self.assertRaises(TypeError, f.__setstate__, BadSequence())
+ 
+ class PartialSubclass(functools.partial):
+@@ -258,11 +292,11 @@
+ 
+ class TestPartialSubclass(TestPartial):
+ 
+-    thetype = PartialSubclass
++    partial = PartialSubclass
+ 
+ class TestPythonPartial(TestPartial):
+ 
+-    thetype = PythonPartial
++    partial = PythonPartial
+ 
+     # the python version isn't picklable
+     test_pickle = None
+@@ -270,6 +304,7 @@
+     test_setstate_errors = None
+     test_setstate_subclasses = None
+     test_setstate_refcount = None
++    test_recursive_pickle = None
+ 
+     # the python version isn't deepcopyable
+     test_deepcopy = None
+diff -r d33e0cf91556 Lib/test/test_gdb.py
+--- a/Lib/test/test_gdb.py
++++ b/Lib/test/test_gdb.py
+@@ -7,6 +7,7 @@
+ import re
+ import subprocess
+ import sys
++import sysconfig
+ import unittest
+ import sysconfig
+ 
+@@ -77,6 +78,9 @@
+         ).communicate()
+     return out, err
+ 
++if not sysconfig.is_python_build():
++    raise unittest.SkipTest("test_gdb only works on source builds at the moment.")
++
+ # Verify that "gdb" was built with the embedded python support enabled:
+ gdbpy_version, _ = run_gdb("--eval-command=python import sys; print(sys.version_info)")
+ if not gdbpy_version:
+diff -r d33e0cf91556 Lib/test/test_getargs2.py
+--- a/Lib/test/test_getargs2.py
++++ b/Lib/test/test_getargs2.py
+@@ -779,7 +779,7 @@
+     def test_u(self):
+         from _testcapi import getargs_u
+         self.assertEqual(getargs_u(u'abc\xe9'), u'abc\xe9')
+-        self.assertEqual(getargs_u(u'nul:\0'), u'nul:')
++        self.assertRaises(TypeError, getargs_u, u'nul:\0')
+         self.assertRaises(TypeError, getargs_u, 'bytes')
+         self.assertRaises(TypeError, getargs_u, bytearray('bytearray'))
+         self.assertRaises(TypeError, getargs_u, memoryview('memoryview'))
+diff -r d33e0cf91556 Lib/test/test_io.py
+--- a/Lib/test/test_io.py
++++ b/Lib/test/test_io.py
+@@ -349,6 +349,15 @@
+             self.assertRaises(IOError, fp.write, "blah")
+             self.assertRaises(IOError, fp.writelines, ["blah\n"])
+ 
++    def test_open_handles_NUL_chars(self):
++        fn_with_NUL = 'foo\0bar'
++        self.assertRaises(TypeError, self.open, fn_with_NUL, 'w')
++
++        bytes_fn = fn_with_NUL.encode('ascii')
++        with warnings.catch_warnings():
++            warnings.simplefilter("ignore", DeprecationWarning)
++            self.assertRaises(TypeError, self.open, bytes_fn, 'w')
++
+     def test_raw_file_io(self):
+         with self.open(support.TESTFN, "wb", buffering=0) as f:
+             self.assertEqual(f.readable(), False)
+diff -r d33e0cf91556 Lib/test/test_long.py
+--- a/Lib/test/test_long.py
++++ b/Lib/test/test_long.py
+@@ -202,6 +202,21 @@
+                 self.assertEqual(x, y,
+                     Frm("bad result for a*b: a=%r, b=%r, x=%r, y=%r", a, b, x, y))
+ 
++    def test_lshift_of_zero(self):
++        self.assertEqual(0L << 0, 0)
++        self.assertEqual(0L << 10, 0)
++        with self.assertRaises(ValueError):
++            0L << -1
++
++    @test_support.cpython_only
++    def test_huge_lshift_of_zero(self):
++        # Shouldn't try to allocate memory for a huge shift. See issue #27870.
++        # Other implementations may have a different boundary for overflow,
++        # or not raise at all.
++        self.assertEqual(0L << sys.maxsize, 0)
++        with self.assertRaises(OverflowError):
++            0L << (sys.maxsize + 1)
++
+     def check_bitop_identities_1(self, x):
+         eq = self.assertEqual
+         eq(x & 0, 0, Frm("x & 0 != 0 for x=%r", x))
+diff -r d33e0cf91556 Lib/test/test_marshal.py
+--- a/Lib/test/test_marshal.py
++++ b/Lib/test/test_marshal.py
+@@ -234,7 +234,10 @@
+         # Create a deeply nested structure.
+         head = last = []
+         # The max stack depth should match the value in Python/marshal.c.
+-        MAX_MARSHAL_STACK_DEPTH = 2000
++        if os.name == 'nt' and hasattr(sys, 'gettotalrefcount'):
++            MAX_MARSHAL_STACK_DEPTH = 1000
++        else:
++            MAX_MARSHAL_STACK_DEPTH = 2000
+         for i in range(MAX_MARSHAL_STACK_DEPTH - 2):
+             last.append([0])
+             last = last[-1]
+diff -r d33e0cf91556 Lib/test/test_os.py
+--- a/Lib/test/test_os.py
++++ b/Lib/test/test_os.py
+@@ -649,7 +649,7 @@
+         except OSError as e:
+             self.assertEqual(e.errno, errno.EBADF)
+         else:
+-            self.fail("%r didn't raise a OSError with a bad file descriptor"
++            self.fail("%r didn't raise an OSError with a bad file descriptor"
+                       % f)
+ 
+     @unittest.skipUnless(hasattr(os, 'isatty'), 'test needs os.isatty()')
+diff -r d33e0cf91556 Lib/test/test_posix.py
+--- a/Lib/test/test_posix.py
++++ b/Lib/test/test_posix.py
+@@ -577,6 +577,48 @@
+                 set([int(x) for x in groups.split()]),
+                 set(posix.getgroups() + [posix.getegid()]))
+ 
++    @test_support.requires_unicode
++    def test_path_with_null_unicode(self):
++        fn = test_support.TESTFN_UNICODE
++        try:
++            fn.encode(test_support.TESTFN_ENCODING)
++        except (UnicodeError, TypeError):
++            self.skipTest("Requires unicode filenames support")
++        fn_with_NUL = fn + u'\0'
++        self.addCleanup(test_support.unlink, fn)
++        test_support.unlink(fn)
++        fd = None
++        try:
++            with self.assertRaises(TypeError):
++                fd = os.open(fn_with_NUL, os.O_WRONLY | os.O_CREAT) # raises
++        finally:
++            if fd is not None:
++                os.close(fd)
++        self.assertFalse(os.path.exists(fn))
++        self.assertRaises(TypeError, os.mkdir, fn_with_NUL)
++        self.assertFalse(os.path.exists(fn))
++        open(fn, 'wb').close()
++        self.assertRaises(TypeError, os.stat, fn_with_NUL)
++
++    def test_path_with_null_byte(self):
++        fn = test_support.TESTFN
++        fn_with_NUL = fn + '\0'
++        self.addCleanup(test_support.unlink, fn)
++        test_support.unlink(fn)
++        fd = None
++        try:
++            with self.assertRaises(TypeError):
++                fd = os.open(fn_with_NUL, os.O_WRONLY | os.O_CREAT) # raises
++        finally:
++            if fd is not None:
++                os.close(fd)
++        self.assertFalse(os.path.exists(fn))
++        self.assertRaises(TypeError, os.mkdir, fn_with_NUL)
++        self.assertFalse(os.path.exists(fn))
++        open(fn, 'wb').close()
++        self.assertRaises(TypeError, os.stat, fn_with_NUL)
++
++
+ class PosixGroupsTester(unittest.TestCase):
+ 
+     def setUp(self):
+diff -r d33e0cf91556 Lib/test/test_posixpath.py
+--- a/Lib/test/test_posixpath.py
++++ b/Lib/test/test_posixpath.py
+@@ -7,6 +7,11 @@
+ import sys
+ from posixpath import realpath, abspath, dirname, basename
+ 
++try:
++    import posix
++except ImportError:
++    posix = None
++
+ # An absolute path to a temporary filename for testing. We can't rely on TESTFN
+ # being an absolute path, so we need this.
+ 
+@@ -100,7 +105,7 @@
+             f.write("foo")
+             f.close()
+             self.assertIs(posixpath.islink(test_support.TESTFN + "1"), False)
+-            if hasattr(os, "symlink"):
++            if hasattr(os, 'symlink'):
+                 os.symlink(test_support.TESTFN + "1", test_support.TESTFN + "2")
+                 self.assertIs(posixpath.islink(test_support.TESTFN + "2"), True)
+                 os.remove(test_support.TESTFN + "1")
+@@ -196,6 +201,65 @@
+     def test_ismount(self):
+         self.assertIs(posixpath.ismount("/"), True)
+ 
++    def test_ismount_non_existent(self):
++        # Non-existent mountpoint.
++        self.assertIs(posixpath.ismount(ABSTFN), False)
++        try:
++            os.mkdir(ABSTFN)
++            self.assertIs(posixpath.ismount(ABSTFN), False)
++        finally:
++            safe_rmdir(ABSTFN)
++
++    @unittest.skipUnless(hasattr(os, 'symlink'),
++                         'Requires functional symlink implementation')
++    def test_ismount_symlinks(self):
++        # Symlinks are never mountpoints.
++        try:
++            os.symlink("/", ABSTFN)
++            self.assertIs(posixpath.ismount(ABSTFN), False)
++        finally:
++            os.unlink(ABSTFN)
++
++    @unittest.skipIf(posix is None, "Test requires posix module")
++    def test_ismount_different_device(self):
++        # Simulate the path being on a different device from its parent by
++        # mocking out st_dev.
++        save_lstat = os.lstat
++        def fake_lstat(path):
++            st_ino = 0
++            st_dev = 0
++            if path == ABSTFN:
++                st_dev = 1
++                st_ino = 1
++            return posix.stat_result((0, st_ino, st_dev, 0, 0, 0, 0, 0, 0, 0))
++        try:
++            os.lstat = fake_lstat
++            self.assertIs(posixpath.ismount(ABSTFN), True)
++        finally:
++            os.lstat = save_lstat
++
++    @unittest.skipIf(posix is None, "Test requires posix module")
++    def test_ismount_directory_not_readable(self):
++        # issue #2466: Simulate ismount run on a directory that is not
++        # readable, which used to return False.
++        save_lstat = os.lstat
++        def fake_lstat(path):
++            st_ino = 0
++            st_dev = 0
++            if path.startswith(ABSTFN) and path != ABSTFN:
++                # ismount tries to read something inside the ABSTFN directory;
++                # simulate this being forbidden (no read permission).
++                raise OSError("Fake [Errno 13] Permission denied")
++            if path == ABSTFN:
++                st_dev = 1
++                st_ino = 1
++            return posix.stat_result((0, st_ino, st_dev, 0, 0, 0, 0, 0, 0, 0))
++        try:
++            os.lstat = fake_lstat
++            self.assertIs(posixpath.ismount(ABSTFN), True)
++        finally:
++            os.lstat = save_lstat
++
+     def test_expanduser(self):
+         self.assertEqual(posixpath.expanduser("foo"), "foo")
+         with test_support.EnvironmentVarGuard() as env:
+diff -r d33e0cf91556 Lib/test/test_pydoc.py
+--- a/Lib/test/test_pydoc.py
++++ b/Lib/test/test_pydoc.py
+@@ -13,6 +13,7 @@
+ import xml.etree
+ import types
+ import test.test_support
++import xml.etree.ElementTree
+ from collections import namedtuple
+ from test.script_helper import assert_python_ok
+ from test.test_support import (TESTFN, rmtree, reap_children, captured_stdout,
+@@ -253,6 +254,14 @@
+         loc = "
Module Docs"
+     return output.strip(), loc
+ 
++def get_pydoc_link(module):
++    "Returns a documentation web link of a module"
++    dirname = os.path.dirname
++    basedir = dirname(dirname(__file__))
++    doc = pydoc.TextDoc()
++    loc = doc.getdocloc(module, basedir=basedir)
++    return loc
++
+ def get_pydoc_text(module):
+     "Returns pydoc generated output as text"
+     doc = pydoc.TextDoc()
+@@ -331,6 +340,11 @@
+             print_diffs(expected_text, result)
+             self.fail("outputs are not equal, see diff above")
+ 
++    def test_mixed_case_module_names_are_lower_cased(self):
++        # issue16484
++        doc_link = get_pydoc_link(xml.etree.ElementTree)
++        self.assertIn('xml.etree.elementtree', doc_link)
++
+     def test_issue8225(self):
+         # Test issue8225 to ensure no doc link appears for xml.etree
+         result, doc_loc = get_pydoc_text(xml.etree)
+diff -r d33e0cf91556 Lib/test/test_pyexpat.py
+--- a/Lib/test/test_pyexpat.py
++++ b/Lib/test/test_pyexpat.py
+@@ -610,11 +610,9 @@
+     def test2(self):
+         xml = "\r\n"
+         parser = expat.ParserCreate()
+-        try:
++        err_pattern = r'XML declaration not well-formed: line 1, column \d+'
++        with self.assertRaisesRegexp(expat.ExpatError, err_pattern):
+             parser.Parse(xml, True)
+-            self.fail()
+-        except expat.ExpatError as e:
+-            self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14')
+ 
+ class ForeignDTDTests(unittest.TestCase):
+     """
+diff -r d33e0cf91556 Lib/test/test_readline.py
+--- a/Lib/test/test_readline.py
++++ b/Lib/test/test_readline.py
+@@ -44,7 +44,7 @@
+ 
+ class TestReadline(unittest.TestCase):
+ 
+-    @unittest.skipIf(readline._READLINE_VERSION < 0x0600
++    @unittest.skipIf(readline._READLINE_VERSION < 0x0601
+                      and "libedit" not in readline.__doc__,
+                      "not supported in this library version")
+     def test_init(self):
+diff -r d33e0cf91556 Lib/test/test_shlex.py
+--- a/Lib/test/test_shlex.py
++++ b/Lib/test/test_shlex.py
+@@ -178,6 +178,19 @@
+                              "%s: %s != %s" %
+                              (self.data[i][0], l, self.data[i][1:]))
+ 
++    def testEmptyStringHandling(self):
++        """Test that parsing of empty strings is correctly handled."""
++        # see Issue #21999
++        expected = ['', ')', 'abc']
++
++        s = shlex.shlex("'')abc", posix=True)
++        slist = list(s)
++        self.assertEqual(slist, expected)
++        expected = ["''", ')', 'abc']
++        s = shlex.shlex("'')abc")
++        self.assertEqual(list(s), expected)
++
++
+ # Allow this test to be used with old shlex.py
+ if not getattr(shlex, "split", None):
+     for methname in dir(ShlexTest):
+diff -r d33e0cf91556 Lib/test/test_socket.py
+--- a/Lib/test/test_socket.py
++++ b/Lib/test/test_socket.py
+@@ -299,7 +299,7 @@
+                               "Error raising socket exception.")
+ 
+     def testSendtoErrors(self):
+-        # Testing that sendto doens't masks failures. See #10169.
++        # Testing that sendto doesn't mask failures. See #10169.
+         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+         self.addCleanup(s.close)
+         s.bind(('', 0))
+diff -r d33e0cf91556 Lib/test/test_ssl.py
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -2622,20 +2622,13 @@
+                         # consume data
+                         s.read()
+ 
++                # read(-1, buffer) is supported, even though read(-1) is not
+                 data = b"data"
+-
+-                # read(-1, buffer) is supported, even though read(-1) is not
+                 s.send(data)
+                 buffer = bytearray(len(data))
+                 self.assertEqual(s.read(-1, buffer), len(data))
+                 self.assertEqual(buffer, data)
+ 
+-                # recv/read(0) should return no data
+-                s.send(data)
+-                self.assertEqual(s.recv(0), b"")
+-                self.assertEqual(s.read(0), b"")
+-                self.assertEqual(s.read(), data)
+-
+                 s.write(b"over\n")
+ 
+                 self.assertRaises(ValueError, s.recv, -1)
+@@ -2643,6 +2636,26 @@
+ 
+                 s.close()
+ 
++        def test_recv_zero(self):
++            server = ThreadedEchoServer(CERTFILE)
++            server.__enter__()
++            self.addCleanup(server.__exit__, None, None)
++            s = socket.create_connection((HOST, server.port))
++            self.addCleanup(s.close)
++            s = ssl.wrap_socket(s, suppress_ragged_eofs=False)
++            self.addCleanup(s.close)
++
++            # recv/read(0) should return no data
++            s.send(b"data")
++            self.assertEqual(s.recv(0), b"")
++            self.assertEqual(s.read(0), b"")
++            self.assertEqual(s.read(), b"data")
++
++            # Should not block if the other end sends no data
++            s.setblocking(False)
++            self.assertEqual(s.recv(0), b"")
++            self.assertEqual(s.recv_into(bytearray()), 0)
++
+         def test_handshake_timeout(self):
+             # Issue #5103: SSL handshake must respect the socket timeout
+             server = socket.socket(socket.AF_INET)
+diff -r d33e0cf91556 Lib/test/test_structseq.py
+--- a/Lib/test/test_structseq.py
++++ b/Lib/test/test_structseq.py
+@@ -88,7 +88,7 @@
+         class Exc(Exception):
+             pass
+ 
+-        # Devious code could crash structseqs' contructors
++        # Devious code could crash structseqs' constructors
+         class C:
+             def __getitem__(self, i):
+                 raise Exc
+diff -r d33e0cf91556 Lib/test/test_support.py
+--- a/Lib/test/test_support.py
++++ b/Lib/test/test_support.py
+@@ -196,7 +196,7 @@
+         # The exponential backoff of the timeout amounts to a total
+         # of ~1 second after which the deletion is probably an error
+         # anyway.
+-        # Testing on a i7@4.3GHz shows that usually only 1 iteration is
++        # Testing on an i7@4.3GHz shows that usually only 1 iteration is
+         # required when contention occurs.
+         timeout = 0.001
+         while timeout < 1.0:
+diff -r d33e0cf91556 Lib/test/test_syntax.py
+--- a/Lib/test/test_syntax.py
++++ b/Lib/test/test_syntax.py
+@@ -371,7 +371,9 @@
+      File "", line 3
+    SyntaxError: 'break' outside loop
+ 
+-This should probably raise a better error than a SystemError (or none at all).
++This raises a SyntaxError, it used to raise a SystemError.
++Context for this change can be found on issue #27514
++
+ In 2.5 there was a missing exception and an assert was triggered in a debug
+ build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
+ 
+@@ -399,7 +401,7 @@
+    ...                      break
+    Traceback (most recent call last):
+      ...
+-   SystemError: too many statically nested blocks
++   SyntaxError: too many statically nested blocks
+ 
+ This tests assignment-context; there was a bug in Python 2.5 where compiling
+ a complex 'if' (one with 'elif') would fail to notice an invalid suite,
+diff -r d33e0cf91556 Lib/test/test_threading.py
+--- a/Lib/test/test_threading.py
++++ b/Lib/test/test_threading.py
+@@ -739,7 +739,7 @@
+ 
+         def generator():
+             while 1:
+-                yield "genereator"
++                yield "generator"
+ 
+         def callback():
+             if callback.gen is None:
+diff -r d33e0cf91556 Lib/test/test_urllib.py
+--- a/Lib/test/test_urllib.py
++++ b/Lib/test/test_urllib.py
+@@ -170,6 +170,18 @@
+         self.assertTrue(urllib.proxy_bypass_environment('anotherdomain.com:8888'))
+         self.assertTrue(urllib.proxy_bypass_environment('newdomain.com:1234'))
+ 
++    def test_proxy_cgi_ignore(self):
++        try:
++            self.env.set('HTTP_PROXY', 'http://somewhere:3128')
++            proxies = urllib.getproxies_environment()
++            self.assertEqual('http://somewhere:3128', proxies['http'])
++            self.env.set('REQUEST_METHOD', 'GET')
++            proxies = urllib.getproxies_environment()
++            self.assertNotIn('http', proxies)
++        finally:
++            self.env.unset('REQUEST_METHOD')
++            self.env.unset('HTTP_PROXY')
++
+     def test_proxy_bypass_environment_host_match(self):
+         bypass = urllib.proxy_bypass_environment
+         self.env.set('NO_PROXY',
+diff -r d33e0cf91556 Lib/test/test_warnings.py
+--- a/Lib/test/test_warnings.py
++++ b/Lib/test/test_warnings.py
+@@ -205,6 +205,18 @@
+             self.assertEqual(str(w[-1].message), text)
+             self.assertTrue(w[-1].category is UserWarning)
+ 
++    def test_message_matching(self):
++        with original_warnings.catch_warnings(record=True,
++                module=self.module) as w:
++            self.module.simplefilter("ignore", UserWarning)
++            self.module.filterwarnings("error", "match", UserWarning)
++            self.assertRaises(UserWarning, self.module.warn, "match")
++            self.assertRaises(UserWarning, self.module.warn, "match prefix")
++            self.module.warn("suffix match")
++            self.assertEqual(w, [])
++            self.module.warn("something completely different")
++            self.assertEqual(w, [])
++
+ class CFilterTests(BaseTest, FilterTests):
+     module = c_warnings
+ 
+diff -r d33e0cf91556 Lib/test/test_zlib.py
+--- a/Lib/test/test_zlib.py
++++ b/Lib/test/test_zlib.py
+@@ -1,4 +1,5 @@
+ import unittest
++from test import test_support as support
+ from test.test_support import TESTFN, run_unittest, import_module, unlink, requires
+ import binascii
+ import pickle
+@@ -80,6 +81,16 @@
+                          zlib.crc32('spam',  (2**31)))
+ 
+ 
++# Issue #10276 - check that inputs >=4GB are handled correctly.
++class ChecksumBigBufferTestCase(unittest.TestCase):
++
++    @precisionbigmemtest(size=_4G + 4, memuse=1, dry_run=False)
++    def test_big_buffer(self, size):
++        data = b"nyan" * (_1G + 1)
++        self.assertEqual(zlib.crc32(data) & 0xFFFFFFFF, 1044521549)
++        self.assertEqual(zlib.adler32(data) & 0xFFFFFFFF, 2256789997)
++
++
+ class ExceptionTestCase(unittest.TestCase):
+     # make sure we generate some expected errors
+     def test_badlevel(self):
+@@ -104,6 +115,15 @@
+         self.assertRaises(ValueError, zlib.decompressobj().flush, 0)
+         self.assertRaises(ValueError, zlib.decompressobj().flush, -1)
+ 
++    @support.cpython_only
++    def test_overflow(self):
++        with self.assertRaisesRegexp(OverflowError, 'int too large'):
++            zlib.decompress(b'', 15, sys.maxsize + 1)
++        with self.assertRaisesRegexp(OverflowError, 'int too large'):
++            zlib.decompressobj().decompress(b'', sys.maxsize + 1)
++        with self.assertRaisesRegexp(OverflowError, 'int too large'):
++            zlib.decompressobj().flush(sys.maxsize + 1)
++
+ 
+ class BaseCompressTestCase(object):
+     def check_big_compress_buffer(self, size, compress_func):
+@@ -167,6 +187,28 @@
+     def test_big_decompress_buffer(self, size):
+         self.check_big_decompress_buffer(size, zlib.decompress)
+ 
++    @precisionbigmemtest(size=_4G, memuse=1)
++    def test_large_bufsize(self, size):
++        # Test decompress(bufsize) parameter greater than the internal limit
++        data = HAMLET_SCENE * 10
++        compressed = zlib.compress(data, 1)
++        self.assertEqual(zlib.decompress(compressed, 15, size), data)
++
++    def test_custom_bufsize(self):
++        data = HAMLET_SCENE * 10
++        compressed = zlib.compress(data, 1)
++        self.assertEqual(zlib.decompress(compressed, 15, CustomInt()), data)
++
++    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
++    @precisionbigmemtest(size=_4G + 100, memuse=4)
++    def test_64bit_compress(self, size):
++        data = b'x' * size
++        try:
++            comp = zlib.compress(data, 0)
++            self.assertEqual(zlib.decompress(comp), data)
++        finally:
++            comp = data = None
++
+ 
+ class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase):
+     # Test compression object
+@@ -318,6 +360,22 @@
+         self.assertRaises(ValueError, dco.decompress, "", -1)
+         self.assertEqual('', dco.unconsumed_tail)
+ 
++    def test_maxlen_large(self):
++        # Sizes up to sys.maxsize should be accepted, although zlib is
++        # internally limited to expressing sizes with unsigned int
++        data = HAMLET_SCENE * 10
++        DEFAULTALLOC = 16 * 1024
++        self.assertGreater(len(data), DEFAULTALLOC)
++        compressed = zlib.compress(data, 1)
++        dco = zlib.decompressobj()
++        self.assertEqual(dco.decompress(compressed, sys.maxsize), data)
++
++    def test_maxlen_custom(self):
++        data = HAMLET_SCENE * 10
++        compressed = zlib.compress(data, 1)
++        dco = zlib.decompressobj()
++        self.assertEqual(dco.decompress(compressed, CustomInt()), data[:100])
++
+     def test_clear_unconsumed_tail(self):
+         # Issue #12050: calling decompress() without providing max_length
+         # should clear the unconsumed_tail attribute.
+@@ -416,6 +474,22 @@
+         data = zlib.compress(input2)
+         self.assertEqual(dco.flush(), input1[1:])
+ 
++    @precisionbigmemtest(size=_4G, memuse=1)
++    def test_flush_large_length(self, size):
++        # Test flush(length) parameter greater than internal limit UINT_MAX
++        input = HAMLET_SCENE * 10
++        data = zlib.compress(input, 1)
++        dco = zlib.decompressobj()
++        dco.decompress(data, 1)
++        self.assertEqual(dco.flush(size), input[1:])
++
++    def test_flush_custom_length(self):
++        input = HAMLET_SCENE * 10
++        data = zlib.compress(input, 1)
++        dco = zlib.decompressobj()
++        dco.decompress(data, 1)
++        self.assertEqual(dco.flush(CustomInt()), input[1:])
++
+     @requires_Compress_copy
+     def test_compresscopy(self):
+         # Test copying a compression object
+@@ -527,6 +601,46 @@
+         decompress = lambda s: d.decompress(s) + d.flush()
+         self.check_big_decompress_buffer(size, decompress)
+ 
++    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
++    @precisionbigmemtest(size=_4G + 100, memuse=4)
++    def test_64bit_compress(self, size):
++        data = b'x' * size
++        co = zlib.compressobj(0)
++        do = zlib.decompressobj()
++        try:
++            comp = co.compress(data) + co.flush()
++            uncomp = do.decompress(comp) + do.flush()
++            self.assertEqual(uncomp, data)
++        finally:
++            comp = uncomp = data = None
++
++    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
++    @precisionbigmemtest(size=_4G + 100, memuse=3)
++    def test_large_unused_data(self, size):
++        data = b'abcdefghijklmnop'
++        unused = b'x' * size
++        comp = zlib.compress(data) + unused
++        do = zlib.decompressobj()
++        try:
++            uncomp = do.decompress(comp) + do.flush()
++            self.assertEqual(unused, do.unused_data)
++            self.assertEqual(uncomp, data)
++        finally:
++            unused = comp = do = None
++
++    @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
++    @precisionbigmemtest(size=_4G + 100, memuse=5)
++    def test_large_unconsumed_tail(self, size):
++        data = b'x' * size
++        do = zlib.decompressobj()
++        try:
++            comp = zlib.compress(data, 0)
++            uncomp = do.decompress(comp, 1) + do.flush()
++            self.assertEqual(uncomp, data)
++            self.assertEqual(do.unconsumed_tail, b'')
++        finally:
++            comp = uncomp = data = None
++
+     def test_wbits(self):
+         co = zlib.compressobj(1, zlib.DEFLATED, 15)
+         zlib15 = co.compress(HAMLET_SCENE) + co.flush()
+@@ -658,9 +772,15 @@
+ """
+ 
+ 
++class CustomInt:
++    def __int__(self):
++        return 100
++
++
+ def test_main():
+     run_unittest(
+         ChecksumTestCase,
++        ChecksumBigBufferTestCase,
+         ExceptionTestCase,
+         CompressTestCase,
+         CompressObjectTestCase
+diff -r d33e0cf91556 Lib/unittest/case.py
+--- a/Lib/unittest/case.py
++++ b/Lib/unittest/case.py
+@@ -529,7 +529,7 @@
+            between the two objects is more than the given delta.
+ 
+            Note that decimal places (from zero) are usually not the same
+-           as significant digits (measured from the most signficant digit).
++           as significant digits (measured from the most significant digit).
+ 
+            If the two objects compare equal then they will automatically
+            compare almost equal.
+@@ -567,7 +567,7 @@
+            between the two objects is less than the given delta.
+ 
+            Note that decimal places (from zero) are usually not the same
+-           as significant digits (measured from the most signficant digit).
++           as significant digits (measured from the most significant digit).
+ 
+            Objects that are equal automatically fail.
+         """
+diff -r d33e0cf91556 Lib/urllib.py
+--- a/Lib/urllib.py
++++ b/Lib/urllib.py
+@@ -1380,12 +1380,21 @@
+     If you need a different way, you can pass a proxies dictionary to the
+     [Fancy]URLopener constructor.
+     """
++    # Get all variables
+     proxies = {}
+     for name, value in os.environ.items():
+         name = name.lower()
+         if value and name[-6:] == '_proxy':
+             proxies[name[:-6]] = value
+ 
++    # CVE-2016-1000110 - If we are running as CGI script, forget HTTP_PROXY
++    # (non-all-lowercase) as it may be set from the web server by a "Proxy:"
++    # header from the client
++    # If "proxy" is lowercase, it will still be used thanks to the next block
++    if 'REQUEST_METHOD' in os.environ:
++        proxies.pop('http', None)
++
++    # Get lowercase variables
+     for name, value in os.environ.items():
+         if name[-6:] == '_proxy':
+             name = name.lower()
+diff -r d33e0cf91556 Lib/xml/dom/expatbuilder.py
+--- a/Lib/xml/dom/expatbuilder.py
++++ b/Lib/xml/dom/expatbuilder.py
+@@ -10,7 +10,7 @@
+ # minidom DOM and can't be used with other DOM implementations.  This
+ # is due, in part, to a lack of appropriate methods in the DOM (there is
+ # no way to create Entity and Notation nodes via the DOM Level 2
+-# interface), and for performance.  The later is the cause of some fairly
++# interface), and for performance.  The latter is the cause of some fairly
+ # cryptic code.
+ #
+ # Performance hacks:
+diff -r d33e0cf91556 Lib/xmlrpclib.py
+--- a/Lib/xmlrpclib.py
++++ b/Lib/xmlrpclib.py
+@@ -970,7 +970,7 @@
+                   "unexpected type in multicall result"
+ 
+ class MultiCall:
+-    """server -> a object used to boxcar method calls
++    """server -> an object used to boxcar method calls
+ 
+     server should be a ServerProxy object.
+ 
+@@ -1334,7 +1334,7 @@
+     ##
+     # Create parser.
+     #
+-    # @return A 2-tuple containing a parser and a unmarshaller.
++    # @return A 2-tuple containing a parser and an unmarshaller.
+ 
+     def getparser(self):
+         # get parser and unmarshaller
+diff -r d33e0cf91556 Mac/IDLE/idlemain.py
+--- a/Mac/IDLE/idlemain.py
++++ b/Mac/IDLE/idlemain.py
+@@ -68,8 +68,6 @@
+         break
+ 
+ # Now it is safe to import idlelib.
+-from idlelib import macosxSupport
+-macosxSupport._appbundle = True
+ from idlelib.PyShell import main
+ if __name__ == '__main__':
+     main()
+diff -r d33e0cf91556 Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -200,7 +200,6 @@
+ PYTHON=		python$(EXE)
+ BUILDPYTHON=	python$(BUILDEXE)
+ 
+-cross_compiling=@cross_compiling@
+ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
+ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
+ HOST_GNU_TYPE=  @host@
+@@ -680,22 +679,11 @@
+ 
+ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h
+ 
+-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
++$(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN)
+ 	@$(MKDIR_P) Include
+-	# Avoid copying the file onto itself for an in-tree build
+-	if test "$(cross_compiling)" != "yes"; then \
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
+-	else \
+-		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
+-		mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
+-	fi
+-$(GRAMMAR_C): $(GRAMMAR_H)
+-	if test "$(cross_compiling)" != "yes"; then \
+-		touch $(GRAMMAR_C); \
+-	else \
+-		cp $(srcdir)/Python/graminit.c $(GRAMMAR_C).tmp; \
+-		mv $(GRAMMAR_C).tmp $(GRAMMAR_C); \
+-	fi
++	$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++$(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H)
++	touch $(GRAMMAR_C)
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+diff -r d33e0cf91556 Misc/ACKS
+--- a/Misc/ACKS
++++ b/Misc/ACKS
+@@ -965,6 +965,7 @@
+ R. David Murray
+ Matti Mäki
+ Jörg Müller
++Kaushik N
+ Dale Nagata
+ John Nagle
+ Takahiro Nakayama
+@@ -1055,6 +1056,7 @@
+ Bo Peng
+ Santiago Peresón
+ George Peristerakis
++Thomas Perl
+ Mathieu Perreault
+ Mark Perrego
+ Trevor Perrin
+@@ -1121,6 +1123,7 @@
+ Jeff Ramnani
+ Varpu Rantala
+ Brodie Rao
++Rémi Rampin
+ Senko Rasic
+ Antti Rasinen
+ Nikolaus Rath
+@@ -1183,6 +1186,7 @@
+ Just van Rossum
+ Hugo van Rossum
+ Saskia van Rossum
++Robin Roth
+ Clement Rouault
+ Donald Wallace Rouse II
+ Liam Routt
+@@ -1529,6 +1533,7 @@
+ Xiang Zhang
+ Robert Xiao
+ Florent Xicluna
++Alakshendra Yadav
+ Hirokazu Yamamoto
+ Ka-Ping Yee
+ Jason Yeo
+@@ -1553,5 +1558,6 @@
+ Cheng Zhang
+ Kai Zhu
+ Tarek Ziadé
++Jelle Zijlstra
+ Gennadiy Zlobin
+ Peter Åstrand
+diff -r d33e0cf91556 Misc/HISTORY
+--- a/Misc/HISTORY
++++ b/Misc/HISTORY
+@@ -388,7 +388,7 @@
+ -----------------
+ 
+ - Bug #1441486: The literal representation of -(sys.maxint - 1)
+-  again evaluates to a int object, not a long.
++  again evaluates to an int object, not a long.
+ 
+ - Bug #1501934: The scope of global variables that are locally assigned
+   using augmented assignment is now correctly determined.
+@@ -4295,7 +4295,7 @@
+   interpreter executions, would fail.
+ 
+ - "%c" % u"a" now returns a unicode string instead of raising a
+-  TypeError. u"%c" % 0xffffffff now raises a OverflowError instead
++  TypeError. u"%c" % 0xffffffff now raises an OverflowError instead
+   of a ValueError to be consistent with "%c" % 256. See SF patch #710127.
+ 
+ Extension modules
+@@ -10633,7 +10633,7 @@
+ 	Bow to font-lock at the end of the docstring, since it throws stuff
+ 	off.
+ 
+-	Make sure the path paramter to readmodule() is a list before adding it
++	Make sure the path parameter to readmodule() is a list before adding it
+ 	with sys.path, or the addition could fail.
+ 
+ 
+@@ -12193,7 +12193,7 @@
+ 
+ - The interfaces for the bind*() and unbind() widget methods have been
+ redesigned; the bind*() methods now return the name of the Tcl command 
+-created for the callback, and this can be passed as a optional
++created for the callback, and this can be passed as an optional
+ argument to unbind() in order to delete the command (normally, such
+ commands are automatically unbound when the widget is destroyed, but
+ for some applications this isn't enough).
+@@ -12685,7 +12685,7 @@
+ - The warning about a thread still having a frame now only happens in
+ verbose mode.
+ 
+-- Change the signal finialization so that it also resets the signal
++- Change the signal finalization so that it also resets the signal
+ handlers.  After this has been called, our signal handlers are no
+ longer active!
+ 
+@@ -13058,7 +13058,7 @@
+ 
+ - The traceback.py module has a new function tb_lineno() by Marc-Andre
+ Lemburg which extracts the line number from the linenumber table in
+-the code object.  Apparently the traceback object doesn't contains the
++the code object.  Apparently the traceback object doesn't contain the
+ right linenumber when -O is used.  Rather than guessing whether -O is
+ on or off, the module itself uses tb_lineno() unconditionally.
+ 
+@@ -14537,7 +14537,7 @@
+ fixed.
+ 
+ - The test of negative number to the float power has been moved from the 
+-built-in pow() functin to floatobject.c (so complex numbers can yield the 
++built-in pow() function to floatobject.c (so complex numbers can yield the
+ correct result).
+ 
+ - The bug introduced in beta2 where shared libraries loaded (using 
+diff -r d33e0cf91556 Misc/NEWS
+--- a/Misc/NEWS
++++ b/Misc/NEWS
+@@ -2,6 +2,141 @@
+ Python News
+ +++++++++++
+ 
++What's New in Python 2.7.13?
++============================
++
++*Release date: XXXX-XX-XX*
++
++Core and Builtins
++-----------------
++
++- Issue #27870: A left shift of zero by a large integer no longer attempts
++  to allocate large amounts of memory.
++
++- Issue #25604: Fix a minor bug in integer true division; this bug could
++  potentially have caused off-by-one-ulp results on platforms with
++  unreliable ldexp implementations.
++
++- Issue #27473: Fixed possible integer overflow in str, unicode and bytearray
++  concatenations and repetitions.  Based on patch by Xiang Zhang.
++
++- Issue #27507: Add integer overflow check in bytearray.extend().  Patch by
++  Xiang Zhang.
++
++- Issue #27581: Don't rely on wrapping for overflow check in
++  PySequence_Tuple().  Patch by Xiang Zhang.
++
++- Issue #23908: os functions, open() and the io.FileIO constructor now reject
++  unicode paths with embedded null character on Windows instead of silently
++  truncating them.
++
++- Issue #27514: Make having too many statically nested blocks a SyntaxError
++  instead of SystemError.
++
++Library
++-------
++
++- Issue #27861: Fixed a crash in sqlite3.Connection.cursor() when a factory
++  creates not a cursor.  Patch by Xiang Zhang.
++
++- Issue #19884: Avoid spurious output on OS X with Gnu Readline.
++
++- Issue #10513: Fix a regression in Connection.commit().  Statements should
++  not be reset after a commit.
++
++- Issue #2466: posixpath.ismount now correctly recognizes mount points which
++  the user does not have permission to access.
++
++- Issue #27783: Fix possible usage of uninitialized memory in operator.methodcaller.
++
++- Issue #27774: Fix possible Py_DECREF on unowned object in _sre.
++
++- Issue #27760: Fix possible integer overflow in binascii.b2a_qp.
++
++- In the curses module, raise an error if window.getstr() or window.instr() is
++  passed a negative value.
++
++- Issue #27758: Fix possible integer overflow in the _csv module for large record
++  lengths.
++
++- Issue #23369: Fixed possible integer overflow in
++  _json.encode_basestring_ascii.
++
++- Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the
++  HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates
++  that the script is in CGI mode.
++
++- Issue #27130: In the "zlib" module, fix handling of large buffers
++  (typically 2 or 4 GiB).  Previously, inputs were limited to 2 GiB, and
++  compression and decompression operations did not properly handle results of
++  2 or 4 GiB.
++
++- Issue #23804: Fix SSL zero-length recv() calls to not block and not raise
++  an error about unclean EOF.
++
++- Issue #27466: Change time format returned by http.cookie.time2netscape,
++  confirming the netscape cookie format and making it consistent with
++  documentation.
++
++- Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong
++  mode no longer break tracing, trace_vinfo() now always returns a list of
++  pairs of strings.
++
++- Issue #27079: Fixed curses.ascii functions isblank(), iscntrl() and ispunct().
++
++- Issue #22636: Avoid shell injection problems with
++  ctypes.util.find_library().
++
++- Issue #27330: Fixed possible leaks in the ctypes module.
++
++- Issue #27238: Got rid of bare excepts in the turtle module.  Original patch
++  by Jelle Zijlstra.
++
++- Issue #26386: Fixed ttk.TreeView selection operations with item id's
++  containing spaces.
++
++- Issue #25455: Fixed a crash in repr of cElementTree.Element with recursive tag.
++
++IDLE
++----
++
++- Issue #27714: text_textview and test_autocomplete now pass when re-run
++  in the same process.  This occurs when test_idle fails when run with the
++  -w option but without -jn.  Fix warning from test_config.
++
++- Issue #27452: add line counter and crc to IDLE configHandler test dump.
++
++- Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names.
++
++- Issue #27245: IDLE: Cleanly delete custom themes and key bindings.
++  Previously, when IDLE was started from a console or by import, a cascade
++  of warnings was emitted.  Patch by Serhiy Storchaka.
++
++Documentation
++-------------
++
++- Issue #16484: Change the default PYTHONDOCS URL to "https:", and fix the
++  resulting links to use lowercase.  Patch by Sean Rodman, test by Kaushik
++  Nadikuditi.
++
++Tests
++-----
++
++- Issue #27369: In test_pyexpat, avoid testing an error message detail that
++  changed in Expat 2.2.0.
++
++Build
++-----
++
++- Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X.
++  Also update FreedBSD version checks for the original ctype UTF-8 workaround.
++
++Windows
++-------
++
++- Issue #27888: Prevent Windows installer from displaying console windows and
++  failing when pip cannot be installed/uninstalled.
++
+ What's New in Python 2.7.12?
+ ============================
+ 
+@@ -10,6 +145,9 @@
+ Build
+ -----
+ 
++- Issue #27641: The configure script now inserts comments into the makefile
++  to prevent the pgen executable from being cross-compiled.
++
+ - Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+ 
+ IDLE
+@@ -1255,7 +1393,7 @@
+   (including empty directories) in ZIP file.
+ 
+ - Issue #22449: In the ssl.SSLContext.load_default_certs, consult the
+-  enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
++  environmental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
+ 
+ - Issue #8473: doctest.testfile now uses universal newline mode to read
+   the test file.
+@@ -1267,7 +1405,7 @@
+ - Issue #22530: Allow the ``group()`` method of regular expression match objects
+   to take a ``long`` as an index.
+ 
+-- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
++- Issue #22517: When an io.BufferedRWPair object is deallocated, clear its
+   weakrefs.
+ 
+ - Issue #10510: distutils register and upload methods now use HTML standards
+@@ -1297,7 +1435,7 @@
+   Sergey Bobrov.
+ 
+ - Issue #21147: sqlite3 now raises an exception if the request contains a null
+-  character instead of truncate it.  Based on patch by Victor Stinner.
++  character instead of truncating it.  Based on patch by Victor Stinner.
+ 
+ - Issue #21951: Fixed a crash in Tkinter on AIX when called Tcl command with
+   empty string or tuple argument.
+@@ -2932,7 +3070,7 @@
+   created with PyFile_FromString().
+ 
+ - Issue #14474: Save and restore exception state in thread.start_new_thread()
+-  while writing error message if the thread leaves a unhandled exception.
++  while writing error message if the thread leaves an unhandled exception.
+ 
+ - Issue #13019: Fix potential reference leaks in bytearray.extend().  Patch
+   by Suman Saha.
+@@ -3419,7 +3557,7 @@
+ - Issue #14157: Fix time.strptime failing without a year on February 29th.
+   Patch by Hynek Schlawack.
+ 
+-- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'.
++- Issue #14768: os.path.expanduser('~/a') doesn't work correctly when HOME is '/'.
+ 
+ - Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running
+   step.  Patch by Xavier de Gaye.
+@@ -3908,7 +4046,7 @@
+ - Issues #12610 and #12609: Verify that user generated AST has correct string
+   and identifier types before compiling.
+ 
+-- Issue #11627: Fix segfault when __new__ on a exception returns a
++- Issue #11627: Fix segfault when __new__ on an exception returns a
+   non-exception class.
+ 
+ - Issue #12149: Update the method cache after a type's dictionnary gets
+@@ -4224,7 +4362,7 @@
+ 
+ - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
+ 
+-- Issue #4376: ctypes now supports nested structures in a endian different than
++- Issue #4376: ctypes now supports nested structures in an endian different than
+   the parent structure. Patch by Vlad Riscutia.
+ 
+ - Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors
+@@ -4543,7 +4681,7 @@
+ - Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
+   there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
+ 
+-- Issue #10451: memoryview objects could allow to mutate a readable buffer.
++- Issue #10451: memoryview objects could allow mutating a readable buffer.
+   Initial patch by Ross Lagerwall.
+ 
+ - Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
+@@ -4612,7 +4750,7 @@
+   seeking a bit forward, writing, then seeking before the previous write but
+   still within buffered data, and writing again).
+ 
+-- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
++- Issue #8498: In socket.accept(), allow specifying 0 as a backlog value in
+   order to accept exactly one connection.  Patch by Daniel Evers.
+ 
+ - Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional.
+@@ -6073,8 +6211,8 @@
+ 
+ - Build the ossaudio extension on GNU/kFreeBSD.
+ 
+-- On Windows, ctypes does no longer check the stack before and after calling a
+-  foreign function.  This allows to use the unmodified libffi library.
++- On Windows, ctypes no longer checks the stack before and after calling a
++  foreign function.  This allows using the unmodified libffi library.
+ 
+ Tests
+ -----
+@@ -6640,7 +6778,7 @@
+ 
+ - Issue #7610: Reworked implementation of the internal ``zipfile.ZipExtFile``
+   class used to represent files stored inside an archive.  The new
+-  implementation is significantly faster and can be wrapped in a
++  implementation is significantly faster and can be wrapped in an
+   ``io.BufferedReader`` object for more speedups.  It also solves an issue
+   where interleaved calls to ``read()`` and ``readline()`` give wrong results.
+   Patch by Nir Aides.
+@@ -7892,10 +8030,10 @@
+   mailbox.MH.get_message().
+ 
+ - Issue #5585: Add the ability to call an initializer to
+-  mulitiprocessing.manager so that users can install custom handlers/etc.
++  multiprocessing.manager so that users can install custom handlers/etc.
+ 
+ - Issue #3551: Patch multiprocessing to raise a proper exception if the size of
+-  the object when writefile is called causes a ERROR_NO_SYSTEM_RESOURCES.  Added
++  the object when writefile is called causes an ERROR_NO_SYSTEM_RESOURCES.  Added
+   docs to note the limitation.
+ 
+ - unittest.assertNotEqual() now uses the inequality operator (!=) instead of the
+@@ -9409,8 +9547,7 @@
+ - The mimetools module has been deprecated for removal in 3.0.
+ 
+ - The ctypes.byref function now takes an optional second parameter
+-  which allows to specify an offset in bytes for the constructed
+-  pointer-like object.
++  which specifies an offset in bytes for the constructed pointer-like object.
+ 
+ - Added the ast module.
+ 
+@@ -10091,7 +10228,7 @@
+   module is:
+     from future_builtins import hex, oct
+ 
+-- Issue #1600: Modifed PyOS_ascii_formatd to use at most 2 digit
++- Issue #1600: Modified PyOS_ascii_formatd to use at most 2 digit
+   exponents for exponents with absolute value < 100.  Follows C99
+   standard.  This is a change on Windows, which would use 3 digits.
+   Also, added 'n' to the formats that PyOS_ascii_formatd understands,
+@@ -11035,7 +11172,7 @@
+   -- the failure just occurred later, with a more cumbersome
+   exception.
+ 
+-- Patch #787789: allow to pass custom TestRunner instances to
++- Patch #787789: allow passing custom TestRunner instances to
+   unittest's main() function.
+ 
+ - Patches #1550273, #1550272: fix a few bugs in unittest and add a
+diff -r d33e0cf91556 Misc/cheatsheet
+--- a/Misc/cheatsheet
++++ b/Misc/cheatsheet
+@@ -434,7 +434,7 @@
+     defaultVal, and adds k to map with value defaultVal. defaultVal is
+     optional. When not provided and k is not in the map, None is returned and
+     added to map.
+-      (6) Raises a KeyError if the dictionary is emtpy.
++      (6) Raises a KeyError if the dictionary is empty.
+       (7) While iterating over a dictionary, the values may be updated but
+           the keys cannot be changed.
+ 
+@@ -953,7 +953,7 @@
+                     instanceobject as arg, returns list of names in its attr.
+                     dict.
+ divmod(a,b)         Returns tuple of (a/b, a%b)
+-enumerate(seq)      Return a iterator giving:  (0, seq[0]), (1, seq[1]), ...
++enumerate(seq)      Return an iterator giving:  (0, seq[0]), (1, seq[1]), ...
+ eval(s[, globals[,  Eval string s in (optional) globals, locals contexts.s must
+ locals]])           have no NUL's or newlines. s can also be acode object.
+                     Example: x = 1; incr_x = eval('x + 1')
+@@ -975,7 +975,7 @@
+ id(object)          Returns a unique 'identity' integer for an object.
+ input([prompt])     Prints prompt if given. Reads input and evaluates it.
+                     Converts a number or a string to a plain integer. Optional
+-int(x[, base])      base paramenter specifies base from which to convert string
++int(x[, base])      base parameter specifies base from which to convert string
+                     values.
+ intern(aString)     Enters aString in the table of "interned strings"
+                     andreturns the string. Interned strings are 'immortals'.
+@@ -991,7 +991,7 @@
+                     copy of it.
+ locals()            Returns a dictionary containing current local variables.
+                     Converts a number or a string to a long integer. Optional
+-long(x[, base])     base paramenter specifies base from which to convert string
++long(x[, base])     base parameter specifies base from which to convert string
+                     values.
+                     Applies function to every item of list and returns a listof
+ map(function, list, the results. If additional arguments are passed,function
+diff -r d33e0cf91556 Misc/developers.txt
+--- a/Misc/developers.txt
++++ b/Misc/developers.txt
+@@ -159,7 +159,7 @@
+   for general contributions to Python.
+ 
+ - Mark Dickinson was given SVN access on 6 January 2008 by Facundo
+-  Batista for his work on mathemathics and number related issues.
++  Batista for his work on mathematics and number related issues.
+ 
+ - Amaury Forgeot d'Arc was given SVN access on 9 November 2007 by MvL,
+   for general contributions to Python.
+diff -r d33e0cf91556 Modules/_csv.c
+--- a/Modules/_csv.c
++++ b/Modules/_csv.c
+@@ -985,11 +985,19 @@
+     int i, rec_len;
+     char *lineterm;
+ 
+-#define ADDCH(c) \
++#define INCLEN \
++    do {\
++        if (!copy_phase && rec_len == INT_MAX) { \
++            goto overflow; \
++        } \
++        rec_len++; \
++    } while(0)
++
++#define ADDCH(c)                                \
+     do {\
+         if (copy_phase) \
+             self->rec[rec_len] = c;\
+-        rec_len++;\
++        INCLEN;\
+     } while(0)
+ 
+     lineterm = PyString_AsString(dialect->lineterminator);
+@@ -1059,11 +1067,18 @@
+     if (*quoted) {
+         if (copy_phase)
+             ADDCH(dialect->quotechar);
+-        else
+-            rec_len += 2;
++        else {
++            INCLEN; /* starting quote */
++            INCLEN; /* ending quote */
++        }
+     }
+     return rec_len;
++
++  overflow:
++    PyErr_NoMemory();
++    return -1;
+ #undef ADDCH
++#undef INCLEN
+ }
+ 
+ static int
+diff -r d33e0cf91556 Modules/_ctypes/_ctypes.c
+--- a/Modules/_ctypes/_ctypes.c
++++ b/Modules/_ctypes/_ctypes.c
+@@ -366,7 +366,7 @@
+ 
+ /*
+   PyCStructType_Type - a meta type/class.  Creating a new class using this one as
+-  __metaclass__ will call the contructor StructUnionType_new.  It replaces the
++  __metaclass__ will call the constructor StructUnionType_new.  It replaces the
+   tp_dict member with a new instance of StgDict, and initializes the C
+   accessible fields somehow.
+ */
+@@ -1174,7 +1174,7 @@
+ static PyObject *
+ CharArray_get_value(CDataObject *self)
+ {
+-    int i;
++    Py_ssize_t i;
+     char *ptr = self->b_ptr;
+     for (i = 0; i < self->b_size; ++i)
+         if (*ptr++ == '\0')
+@@ -1236,9 +1236,9 @@
+ static PyObject *
+ WCharArray_get_value(CDataObject *self)
+ {
+-    unsigned int i;
++    Py_ssize_t i;
+     wchar_t *ptr = (wchar_t *)self->b_ptr;
+-    for (i = 0; i < self->b_size/sizeof(wchar_t); ++i)
++    for (i = 0; i < self->b_size/(Py_ssize_t)sizeof(wchar_t); ++i)
+         if (*ptr++ == (wchar_t)0)
+             break;
+     return PyUnicode_FromWideChar((wchar_t *)self->b_ptr, i);
+@@ -1267,7 +1267,7 @@
+         return -1;
+     } else
+         Py_INCREF(value);
+-    if ((unsigned)PyUnicode_GET_SIZE(value) > self->b_size/sizeof(wchar_t)) {
++    if ((size_t)PyUnicode_GET_SIZE(value) > self->b_size/sizeof(wchar_t)) {
+         PyErr_SetString(PyExc_ValueError,
+                         "string too long");
+         result = -1;
+@@ -1308,8 +1308,10 @@
+         descr = PyDescr_NewMethod(type, meth);
+         if (descr == NULL)
+             return -1;
+-        if (PyDict_SetItemString(dict,meth->ml_name, descr) < 0)
++        if (PyDict_SetItemString(dict, meth->ml_name, descr) < 0) {
++            Py_DECREF(descr);
+             return -1;
++        }
+         Py_DECREF(descr);
+     }
+     return 0;
+@@ -1324,8 +1326,10 @@
+         descr = PyDescr_NewMember(type, memb);
+         if (descr == NULL)
+             return -1;
+-        if (PyDict_SetItemString(dict, memb->name, descr) < 0)
++        if (PyDict_SetItemString(dict, memb->name, descr) < 0) {
++            Py_DECREF(descr);
+             return -1;
++        }
+         Py_DECREF(descr);
+     }
+     return 0;
+@@ -1341,8 +1345,10 @@
+         descr = PyDescr_NewGetSet(type, gsp);
+         if (descr == NULL)
+             return -1;
+-        if (PyDict_SetItemString(dict, gsp->name, descr) < 0)
++        if (PyDict_SetItemString(dict, gsp->name, descr) < 0) {
++            Py_DECREF(descr);
+             return -1;
++        }
+         Py_DECREF(descr);
+     }
+     return 0;
+@@ -1843,8 +1849,10 @@
+ 
+     Py_INCREF(name);
+     PyString_Concat(&name, suffix);
+-    if (name == NULL)
++    if (name == NULL) {
++        Py_DECREF(swapped_args);
+         return NULL;
++    }
+ 
+     PyTuple_SET_ITEM(swapped_args, 0, name);
+     for (i=1; iffi_type_pointer = *fmt->pffi_type;
+     stgdict->align = fmt->pffi_type->alignment;
+@@ -2045,20 +2055,25 @@
+             PyObject *meth;
+             int x;
+             meth = PyDescr_NewClassMethod(result, ml);
+-            if (!meth)
++            if (!meth) {
++                Py_DECREF(result);
+                 return NULL;
++            }
+ #else
+ #error
+             PyObject *meth, *func;
+             int x;
+             func = PyCFunction_New(ml, NULL);
+-            if (!func)
++            if (!func) {
++                Py_DECREF(result);
+                 return NULL;
++            }
+             meth = PyObject_CallFunctionObjArgs(
+                 (PyObject *)&PyClassMethod_Type,
+                 func, NULL);
+             Py_DECREF(func);
+             if (!meth) {
++                Py_DECREF(result);
+                 return NULL;
+             }
+ #endif
+@@ -2241,8 +2256,10 @@
+ 
+     nArgs = PyTuple_GET_SIZE(ob);
+     converters = PyTuple_New(nArgs);
+-    if (!converters)
++    if (!converters) {
++        Py_DECREF(ob);
+         return NULL;
++    }
+ 
+     /* I have to check if this is correct. Using c_char, which has a size
+        of 1, will be assumed to be pushed as only one byte!
+@@ -3968,7 +3985,7 @@
+                                                    self,
+                                                    callargs,
+                                                    NULL);
+-        /* If the errcheck funtion failed, return NULL.
++        /* If the errcheck function failed, return NULL.
+            If the errcheck function returned callargs unchanged,
+            continue normal processing.
+            If the errcheck function returned something else,
+diff -r d33e0cf91556 Modules/_ctypes/_ctypes_test.c
+--- a/Modules/_ctypes/_ctypes_test.c
++++ b/Modules/_ctypes/_ctypes_test.c
+@@ -34,6 +34,24 @@
+     return func(a*a, b*b, c*c, d*d, e*e);
+ }
+ 
++/*
++ * This structure should be the same as in test_callbacks.py and the
++ * method test_callback_large_struct. See issues 17310 and 20160: the
++ * structure must be larger than 8 bytes long.
++ */
++
++typedef struct {
++    unsigned long first;
++    unsigned long second;
++    unsigned long third;
++} Test;
++
++EXPORT(void)
++_testfunc_cbk_large_struct(Test in, void (*func)(Test))
++{
++    func(in);
++}
++
+ EXPORT(void)testfunc_array(int values[4])
+ {
+     printf("testfunc_array %d %d %d %d\n",
+diff -r d33e0cf91556 Modules/_ctypes/callbacks.c
+--- a/Modules/_ctypes/callbacks.c
++++ b/Modules/_ctypes/callbacks.c
+@@ -385,7 +385,7 @@
+ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
+ {
+     CThunkObject *p;
+-    int i;
++    Py_ssize_t i;
+ 
+     p = PyObject_GC_NewVar(CThunkObject, &PyCThunk_Type, nArgs);
+     if (p == NULL) {
+@@ -393,11 +393,13 @@
+         return NULL;
+     }
+ 
++    p->pcl_write = NULL;
+     p->pcl_exec = NULL;
+-    p->pcl_write = NULL;
+     memset(&p->cif, 0, sizeof(p->cif));
++    p->flags = 0;
+     p->converters = NULL;
+     p->callable = NULL;
++    p->restype = NULL;
+     p->setfunc = NULL;
+     p->ffi_restype = NULL;
+ 
+diff -r d33e0cf91556 Modules/_ctypes/callproc.c
+--- a/Modules/_ctypes/callproc.c
++++ b/Modules/_ctypes/callproc.c
+@@ -92,8 +92,10 @@
+ #define CTYPES_CAPSULE_ERROROBJ "_ctypes/callproc.c error object"
+ CTYPES_CAPSULE_INSTANTIATE_DESTRUCTOR(CTYPES_CAPSULE_ERROROBJ)
+ 
+-#define CTYPES_CAPSULE_WCHAR_T "_ctypes/callproc.c wchar_t buffer from unicode"
++#if defined(CTYPES_UNICODE) && !defined(HAVE_USABLE_WCHAR_T)
++#  define CTYPES_CAPSULE_WCHAR_T "_ctypes/callproc.c wchar_t buffer from unicode"
+ CTYPES_CAPSULE_INSTANTIATE_DESTRUCTOR(CTYPES_CAPSULE_WCHAR_T)
++#endif
+ 
+ /*
+   ctypes maintains thread-local storage that has space for two error numbers:
+@@ -162,8 +164,10 @@
+             return NULL;
+         memset(space, 0, sizeof(int) * 2);
+         errobj = CAPSULE_NEW(space, CTYPES_CAPSULE_ERROROBJ);
+-        if (errobj == NULL)
++        if (errobj == NULL) {
++            PyMem_Free(space);
+             return NULL;
++        }
+         if (-1 == PyDict_SetItem(dict, error_object_name,
+                                  errobj)) {
+             Py_DECREF(errobj);
+@@ -1277,7 +1281,7 @@
+     PyObject *nameobj;
+     PyObject *ignored;
+     HMODULE hMod;
+-    if (!PyArg_ParseTuple(args, "O|O:LoadLibrary", &nameobj, &ignored))
++    if (!PyArg_ParseTuple(args, "S|O:LoadLibrary", &nameobj, &ignored))
+         return NULL;
+ #ifdef _UNICODE
+     name = alloca((PyString_Size(nameobj) + 1) * sizeof(WCHAR));
+@@ -1815,6 +1819,10 @@
+         if (result == NULL)
+             return result;
+         key = PyLong_FromVoidPtr(result);
++        if (key == NULL) {
++            Py_DECREF(result);
++            return NULL;
++        }
+     } else if (PyType_Check(cls)) {
+         typ = (PyTypeObject *)cls;
+         buf = PyMem_Malloc(strlen(typ->tp_name) + 3 + 1);
+diff -r d33e0cf91556 Modules/_ctypes/cfield.c
+--- a/Modules/_ctypes/cfield.c
++++ b/Modules/_ctypes/cfield.c
+@@ -12,8 +12,10 @@
+ #include "ctypes.h"
+ 
+ 
+-#define CTYPES_CAPSULE_WCHAR_T "_ctypes/cfield.c wchar_t buffer from unicode"
++#if defined(CTYPES_UNICODE) && !defined(HAVE_USABLE_WCHAR_T)
++#   define CTYPES_CAPSULE_WCHAR_T "_ctypes/cfield.c wchar_t buffer from unicode"
+ CTYPES_CAPSULE_INSTANTIATE_DESTRUCTOR(CTYPES_CAPSULE_WCHAR_T)
++#endif
+ 
+ 
+ /******************************************************************/
+@@ -48,7 +50,7 @@
+ {
+     CFieldObject *self;
+     PyObject *proto;
+-    Py_ssize_t size, align, length;
++    Py_ssize_t size, align;
+     SETFUNC setfunc = NULL;
+     GETFUNC getfunc = NULL;
+     StgDictObject *dict;
+@@ -102,7 +104,6 @@
+     }
+ 
+     size = dict->size;
+-    length = dict->length;
+     proto = desc;
+ 
+     /*  Field descriptors for 'c_char * n' are be scpecial cased to
+@@ -1313,7 +1314,7 @@
+         return NULL;
+     size = strlen(data);
+     if (size < length) {
+-        /* This will copy the leading NUL character
++        /* This will copy the trailing NUL character
+          * if there is space for it.
+          */
+         ++size;
+@@ -1508,6 +1509,7 @@
+     if (value) {
+         Py_ssize_t size = PyUnicode_GET_SIZE(value);
+         if ((unsigned) size != size) {
++            Py_DECREF(value);
+             PyErr_SetString(PyExc_ValueError, "String too long for BSTR");
+             return NULL;
+         }
+diff -r d33e0cf91556 Modules/_ctypes/ctypes.h
+--- a/Modules/_ctypes/ctypes.h
++++ b/Modules/_ctypes/ctypes.h
+@@ -229,7 +229,7 @@
+    remember is that in PyCArrayType_new the ffi_type fields must be filled in -
+    so far it was unneeded because libffi doesn't support arrays at all
+    (because they are passed as pointers to function calls anyway).  But it's
+-   too much risk to change that now, and there are other fields which doen't
++   too much risk to change that now, and there are other fields which doesn't
+    belong into this structure anyway.  Maybe in ctypes 2.0... (ctypes 2000?)
+ */
+     Py_ssize_t size;            /* number of bytes */
+diff -r d33e0cf91556 Modules/_ctypes/libffi/ltmain.sh
+--- a/Modules/_ctypes/libffi/ltmain.sh
++++ b/Modules/_ctypes/libffi/ltmain.sh
+@@ -1438,7 +1438,7 @@
+ 
+     case " $hookable_fns " in
+       *" $1 "*) ;;
+-      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
++      *) func_fatal_error "'$1' does not support hook functions." ;;
+     esac
+ 
+     eval _G_hook_fns=\$$1_hooks; shift
+diff -r d33e0cf91556 Modules/_ctypes/libffi/src/x86/darwin64.S
+--- a/Modules/_ctypes/libffi/src/x86/darwin64.S
++++ b/Modules/_ctypes/libffi/src/x86/darwin64.S
+@@ -350,7 +350,7 @@
+ 	.set	L$set$3,LUW1-LUW0
+ 	.long	L$set$3
+ 
+-	/* New stack frame based off rbp.  This is a itty bit of unwind
++	/* New stack frame based off rbp.  This is an itty bit of unwind
+ 	   trickery in that the CFA *has* changed.  There is no easy way
+ 	   to describe it correctly on entry to the function.  Fortunately,
+ 	   it doesn't matter too much since at all points we can correctly
+diff -r d33e0cf91556 Modules/_ctypes/libffi/src/x86/unix64.S
+--- a/Modules/_ctypes/libffi/src/x86/unix64.S
++++ b/Modules/_ctypes/libffi/src/x86/unix64.S
+@@ -366,7 +366,7 @@
+ 	.byte	0x4			/* DW_CFA_advance_loc4 */
+ 	.long	.LUW1-.LUW0
+ 
+-	/* New stack frame based off rbp.  This is a itty bit of unwind
++	/* New stack frame based off rbp.  This is an itty bit of unwind
+ 	   trickery in that the CFA *has* changed.  There is no easy way
+ 	   to describe it correctly on entry to the function.  Fortunately,
+ 	   it doesn't matter too much since at all points we can correctly
+diff -r d33e0cf91556 Modules/_ctypes/libffi_msvc/ffi.c
+--- a/Modules/_ctypes/libffi_msvc/ffi.c
++++ b/Modules/_ctypes/libffi_msvc/ffi.c
+@@ -359,7 +359,7 @@
+ 
+   if ( cif->rtype->type == FFI_TYPE_STRUCT ) {
+     *rvalue = *(void **) argp;
+-    argp += 4;
++    argp += sizeof(void *);
+   }
+ 
+   p_argv = avalue;
+@@ -370,13 +370,23 @@
+ 
+       /* Align if necessary */
+       if ((sizeof(char *) - 1) & (size_t) argp) {
+-	argp = (char *) ALIGN(argp, sizeof(char*));
++        argp = (char *) ALIGN(argp, sizeof(char*));
+       }
+ 
+       z = (*p_arg)->size;
+ 
+       /* because we're little endian, this is what it turns into.   */
+ 
++#ifdef _WIN64
++      if (z > 8) {
++        /* On Win64, if a single argument takes more than 8 bytes,
++         * then it is always passed by reference.
++         */
++        *p_argv = *((void**) argp);
++        z = 8;
++      }
++      else
++#endif
+       *p_argv = (void*) argp;
+ 
+       p_argv++;
+diff -r d33e0cf91556 Modules/_ctypes/libffi_osx/x86/darwin64.S
+--- a/Modules/_ctypes/libffi_osx/x86/darwin64.S
++++ b/Modules/_ctypes/libffi_osx/x86/darwin64.S
+@@ -351,7 +351,7 @@
+  .set  L$set$3,LUW1-LUW0
+  .long L$set$3
+ 
+- /* New stack frame based off rbp.  This is a itty bit of unwind
++ /* New stack frame based off rbp.  This is an itty bit of unwind
+     trickery in that the CFA *has* changed.  There is no easy way
+     to describe it correctly on entry to the function.  Fortunately,
+     it doesn't matter too much since at all points we can correctly
+diff -r d33e0cf91556 Modules/_cursesmodule.c
+--- a/Modules/_cursesmodule.c
++++ b/Modules/_cursesmodule.c
+@@ -918,6 +918,10 @@
+     case 1:
+         if (!PyArg_ParseTuple(args,"i;n", &n))
+             return NULL;
++        if (n < 0) {
++            PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
++            return NULL;
++        }
+         Py_BEGIN_ALLOW_THREADS
+         rtn2 = wgetnstr(self->win,rtn,MIN(n, 1023));
+         Py_END_ALLOW_THREADS
+@@ -936,6 +940,10 @@
+     case 3:
+         if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n))
+             return NULL;
++        if (n < 0) {
++            PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
++            return NULL;
++        }
+ #ifdef STRICT_SYSV_CURSES
+         Py_BEGIN_ALLOW_THREADS
+         rtn2 = wmove(self->win,y,x)==ERR ? ERR :
+@@ -1087,6 +1095,10 @@
+     case 1:
+         if (!PyArg_ParseTuple(args,"i;n", &n))
+             return NULL;
++        if (n < 0) {
++            PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
++            return NULL;
++        }
+         rtn2 = winnstr(self->win,rtn,MIN(n,1023));
+         break;
+     case 2:
+@@ -1097,6 +1109,10 @@
+     case 3:
+         if (!PyArg_ParseTuple(args, "iii;y,x,n", &y, &x, &n))
+             return NULL;
++        if (n < 0) {
++            PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative");
++            return NULL;
++        }
+         rtn2 = mvwinnstr(self->win, y, x, rtn, MIN(n,1023));
+         break;
+     default:
+diff -r d33e0cf91556 Modules/_elementtree.c
+--- a/Modules/_elementtree.c
++++ b/Modules/_elementtree.c
+@@ -1222,18 +1222,28 @@
+ static PyObject*
+ element_repr(ElementObject* self)
+ {
+-    PyObject *repr, *tag;
+-
+-    tag = PyObject_Repr(self->tag);
+-    if (!tag)
+-        return NULL;
+-
+-    repr = PyString_FromFormat("",
+-                               PyString_AS_STRING(tag), self);
+-
+-    Py_DECREF(tag);
+-
+-    return repr;
++    int status;
++
++    if (self->tag == NULL)
++        return PyUnicode_FromFormat("", self);
++
++    status = Py_ReprEnter((PyObject *)self);
++    if (status == 0) {
++        PyObject *repr, *tag;
++        tag = PyObject_Repr(self->tag);
++        if (!tag)
++            return NULL;
++
++        repr = PyString_FromFormat("",
++                                   PyString_AS_STRING(tag), self);
++        Py_DECREF(tag);
++        return repr;
++    }
++    if (status > 0)
++        PyErr_Format(PyExc_RuntimeError,
++                     "reentrant call inside %s.__repr__",
++                     Py_TYPE(self)->tp_name);
++    return NULL;
+ }
+ 
+ static PyObject*
+diff -r d33e0cf91556 Modules/_hashopenssl.c
+--- a/Modules/_hashopenssl.c
++++ b/Modules/_hashopenssl.c
+@@ -730,7 +730,7 @@
+     if (openssl_obj_name == NULL)
+         return;
+     /* Ignore aliased names, they pollute the list and OpenSSL appears to
+-     * have a its own definition of alias as the resulting list still
++     * have its own definition of alias as the resulting list still
+      * contains duplicate and alternate names for several algorithms.     */
+     if (openssl_obj_name->alias)
+         return;
+diff -r d33e0cf91556 Modules/_io/_iomodule.c
+--- a/Modules/_io/_iomodule.c
++++ b/Modules/_io/_iomodule.c
+@@ -74,7 +74,7 @@
+ "Another IOBase subclass, TextIOBase, deals with the encoding and decoding\n"
+ "of streams into text. TextIOWrapper, which extends it, is a buffered text\n"
+ "interface to a buffered raw stream (`BufferedIOBase`). Finally, StringIO\n"
+-"is a in-memory stream for text.\n"
++"is an in-memory stream for text.\n"
+ "\n"
+ "Argument names are not part of the specification, and only the arguments\n"
+ "of open() are intended to be used as keyword arguments.\n"
+diff -r d33e0cf91556 Modules/_io/fileio.c
+--- a/Modules/_io/fileio.c
++++ b/Modules/_io/fileio.c
+@@ -224,8 +224,13 @@
+     }
+ 
+ #ifdef MS_WINDOWS
+-    if (PyUnicode_Check(nameobj))
++    if (PyUnicode_Check(nameobj)) {
+         widename = PyUnicode_AS_UNICODE(nameobj);
++        if (wcslen(widename) != (size_t)PyUnicode_GET_SIZE(nameobj)) {
++            PyErr_SetString(PyExc_TypeError, "embedded NUL character");
++            return -1;
++        }
++    }
+     if (widename == NULL)
+ #endif
+     if (fd < 0)
+@@ -234,6 +239,10 @@
+             Py_ssize_t namelen;
+             if (PyObject_AsCharBuffer(nameobj, &name, &namelen) < 0)
+                 return -1;
++            if (strlen(name) != (size_t)namelen) {
++                PyErr_SetString(PyExc_TypeError, "embedded NUL character");
++                return -1;
++            }
+         }
+         else {
+             PyObject *u = PyUnicode_FromObject(nameobj);
+@@ -252,6 +261,10 @@
+                 goto error;
+             }
+             name = PyBytes_AS_STRING(stringobj);
++            if (strlen(name) != (size_t)PyBytes_GET_SIZE(stringobj)) {
++                PyErr_SetString(PyExc_TypeError, "embedded NUL character");
++                goto error;
++            }
+         }
+     }
+ 
+diff -r d33e0cf91556 Modules/_io/iobase.c
+--- a/Modules/_io/iobase.c
++++ b/Modules/_io/iobase.c
+@@ -35,7 +35,7 @@
+     "Even though IOBase does not declare read, readinto, or write because\n"
+     "their signatures will vary, implementations and clients should\n"
+     "consider those methods part of the interface. Also, implementations\n"
+-    "may raise a IOError when operations they do not support are called.\n"
++    "may raise an IOError when operations they do not support are called.\n"
+     "\n"
+     "The basic type used for binary data read from or written to a file is\n"
+     "the bytes type. Method arguments may also be bytearray or memoryview\n"
+diff -r d33e0cf91556 Modules/_io/textio.c
+--- a/Modules/_io/textio.c
++++ b/Modules/_io/textio.c
+@@ -881,8 +881,8 @@
+             if (self->encoding == NULL) {
+               catch_ImportError:
+                 /*
+-                 Importing locale can raise a ImportError because of
+-                 _functools, and locale.getpreferredencoding can raise a
++                 Importing locale can raise an ImportError because of
++                 _functools, and locale.getpreferredencoding can raise an
+                  ImportError if _locale is not available.  These will happen
+                  during module building.
+                 */
+diff -r d33e0cf91556 Modules/_json.c
+--- a/Modules/_json.c
++++ b/Modules/_json.c
+@@ -211,6 +211,10 @@
+     input_unicode = PyUnicode_AS_UNICODE(pystr);
+ 
+     /* One char input can be up to 6 chars output, estimate 4 of these */
++    if (input_chars > (PY_SSIZE_T_MAX - 2)/ MAX_EXPANSION) {
++        PyErr_SetString(PyExc_OverflowError, "string is too long to escape");
++        return NULL;
++    }
+     output_size = 2 + (MIN_EXPANSION * 4) + input_chars;
+     max_output_size = 2 + (input_chars * MAX_EXPANSION);
+     rval = PyString_FromStringAndSize(NULL, output_size);
+diff -r d33e0cf91556 Modules/_sqlite/connection.c
+--- a/Modules/_sqlite/connection.c
++++ b/Modules/_sqlite/connection.c
+@@ -116,7 +116,7 @@
+             return -1;
+         }
+     } else {
+-        /* Create a pysqlite connection from a APSW connection */
++        /* Create a pysqlite connection from an APSW connection */
+         class_attr = PyObject_GetAttrString(database, "__class__");
+         if (class_attr) {
+             class_attr_str = PyObject_Str(class_attr);
+@@ -324,7 +324,7 @@
+ 
+ PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
+ {
+-    static char *kwlist[] = {"factory", NULL, NULL};
++    static char *kwlist[] = {"factory", NULL};
+     PyObject* factory = NULL;
+     PyObject* cursor;
+ 
+@@ -341,7 +341,16 @@
+         factory = (PyObject*)&pysqlite_CursorType;
+     }
+ 
+-    cursor = PyObject_CallFunction(factory, "O", self);
++    cursor = PyObject_CallFunctionObjArgs(factory, (PyObject *)self, NULL);
++    if (cursor == NULL)
++        return NULL;
++    if (!PyObject_TypeCheck(cursor, &pysqlite_CursorType)) {
++        PyErr_Format(PyExc_TypeError,
++                     "factory must return a cursor, not %.100s",
++                     Py_TYPE(cursor)->tp_name);
++        Py_DECREF(cursor);
++        return NULL;
++    }
+ 
+     _pysqlite_drop_unused_cursor_references(self);
+ 
+@@ -458,7 +467,6 @@
+     }
+ 
+     if (self->inTransaction) {
+-        pysqlite_do_all_statements(self, ACTION_RESET, 0);
+ 
+         Py_BEGIN_ALLOW_THREADS
+         rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail);
+diff -r d33e0cf91556 Modules/_sqlite/connection.h
+--- a/Modules/_sqlite/connection.h
++++ b/Modules/_sqlite/connection.h
+@@ -99,7 +99,7 @@
+     /* a dictionary of registered collation name => collation callable mappings */
+     PyObject* collations;
+ 
+-    /* if our connection was created from a APSW connection, we keep a
++    /* if our connection was created from an APSW connection, we keep a
+      * reference to the APSW connection around and get rid of it in our
+      * destructor */
+     PyObject* apsw_connection;
+diff -r d33e0cf91556 Modules/_sre.c
+--- a/Modules/_sre.c
++++ b/Modules/_sre.c
+@@ -3438,10 +3438,8 @@
+         if (!key)
+             goto failed;
+         value = match_getslice(self, key, def);
+-        if (!value) {
+-            Py_DECREF(key);
++        if (!value)
+             goto failed;
+-        }
+         status = PyDict_SetItem(result, key, value);
+         Py_DECREF(value);
+         if (status < 0)
+diff -r d33e0cf91556 Modules/_ssl.c
+--- a/Modules/_ssl.c
++++ b/Modules/_ssl.c
+@@ -1702,6 +1702,10 @@
+         dest = PyBytes_FromStringAndSize(NULL, len);
+         if (dest == NULL)
+             goto error;
++        if (len == 0) {
++            Py_XDECREF(sock);
++            return dest;
++        }
+         mem = PyBytes_AS_STRING(dest);
+     }
+     else {
+@@ -1714,6 +1718,10 @@
+                                 "maximum length can't fit in a C 'int'");
+                 goto error;
+             }
++            if (len == 0) {
++                count = 0;
++                goto done;
++            }
+         }
+     }
+ 
+@@ -3386,7 +3394,7 @@
+ #endif /* HAVE_OPENSSL_RAND */
+ 
+ 
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+ 
+ static PyObject *
+ PySSL_RAND_egd(PyObject *self, PyObject *arg)
+@@ -3414,7 +3422,7 @@
+ Returns number of bytes read.  Raises SSLError if connection to EGD\n\
+ fails or if it does not provide enough data to seed PRNG.");
+ 
+-#endif /* HAVE_RAND_EGD */
++#endif /* !OPENSSL_NO_EGD */
+ 
+ 
+ PyDoc_STRVAR(PySSL_get_default_verify_paths_doc,
+@@ -3814,7 +3822,7 @@
+     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
+      PySSL_RAND_status_doc},
+ #endif
+-#ifdef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
+      PySSL_RAND_egd_doc},
+ #endif
+diff -r d33e0cf91556 Modules/_tkinter.c
+--- a/Modules/_tkinter.c
++++ b/Modules/_tkinter.c
+@@ -52,8 +52,8 @@
+      (size_t)(size) <= UINT_MAX / (size_t)(elemsize))
+ 
+ /* Starting with Tcl 8.4, many APIs offer const-correctness.  Unfortunately,
+-   making _tkinter correct for this API means to break earlier
+-   versions. USE_COMPAT_CONST allows to make _tkinter work with both 8.4 and
++   making _tkinter correct for this API means breaking earlier
++   versions. USE_COMPAT_CONST allows making _tkinter work with both 8.4 and
+    earlier versions. Once Tcl releases before 8.4 don't need to be supported
+    anymore, this should go. */
+ #define USE_COMPAT_CONST
+diff -r d33e0cf91556 Modules/arraymodule.c
+--- a/Modules/arraymodule.c
++++ b/Modules/arraymodule.c
+@@ -1067,13 +1067,25 @@
+ static PyObject *
+ array_buffer_info(arrayobject *self, PyObject *unused)
+ {
+-    PyObject* retval = NULL;
++    PyObject *retval = NULL, *v;
++
+     retval = PyTuple_New(2);
+     if (!retval)
+         return NULL;
+ 
+-    PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item));
+-    PyTuple_SET_ITEM(retval, 1, PyInt_FromLong((long)(Py_SIZE(self))));
++    v = PyLong_FromVoidPtr(self->ob_item);
++    if (v == NULL) {
++        Py_DECREF(retval);
++        return NULL;
++    }
++    PyTuple_SET_ITEM(retval, 0, v);
++
++    v = PyInt_FromSsize_t(Py_SIZE(self));
++    if (v == NULL) {
++        Py_DECREF(retval);
++        return NULL;
++    }
++    PyTuple_SET_ITEM(retval, 1, v);
+ 
+     return retval;
+ }
+diff -r d33e0cf91556 Modules/audioop.c
+--- a/Modules/audioop.c
++++ b/Modules/audioop.c
+@@ -121,7 +121,7 @@
+ 
+ /*
+  * linear2ulaw() accepts a 14-bit signed integer and encodes it as u-law data
+- * stored in a unsigned char.  This function should only be called with
++ * stored in an unsigned char.  This function should only be called with
+  * the data shifted such that it only contains information in the lower
+  * 14-bits.
+  *
+diff -r d33e0cf91556 Modules/binascii.c
+--- a/Modules/binascii.c
++++ b/Modules/binascii.c
+@@ -1316,6 +1316,7 @@
+     /* First, scan to see how many characters need to be encoded */
+     in = 0;
+     while (in < datalen) {
++        Py_ssize_t delta = 0;
+         if ((data[in] > 126) ||
+             (data[in] == '=') ||
+             (header && data[in] == '_') ||
+@@ -1331,12 +1332,12 @@
+             if ((linelen + 3) >= MAXLINESIZE) {
+                 linelen = 0;
+                 if (crlf)
+-                    odatalen += 3;
++                    delta += 3;
+                 else
+-                    odatalen += 2;
++                    delta += 2;
+             }
+             linelen += 3;
+-            odatalen += 3;
++            delta += 3;
+             in++;
+         }
+         else {
+@@ -1348,11 +1349,11 @@
+                 linelen = 0;
+                 /* Protect against whitespace on end of line */
+                 if (in && ((data[in-1] == ' ') || (data[in-1] == '\t')))
+-                    odatalen += 2;
++                    delta += 2;
+                 if (crlf)
+-                    odatalen += 2;
++                    delta += 2;
+                 else
+-                    odatalen += 1;
++                    delta += 1;
+                 if (data[in] == '\r')
+                     in += 2;
+                 else
+@@ -1364,15 +1365,21 @@
+                     (linelen + 1) >= MAXLINESIZE) {
+                     linelen = 0;
+                     if (crlf)
+-                        odatalen += 3;
++                        delta += 3;
+                     else
+-                        odatalen += 2;
++                        delta += 2;
+                 }
+                 linelen++;
+-                odatalen++;
++                delta++;
+                 in++;
+             }
+         }
++        if (PY_SSIZE_T_MAX - delta < odatalen) {
++            PyBuffer_Release(&pdata);
++            PyErr_NoMemory();
++            return NULL;
++        }
++        odatalen += delta;
+     }
+ 
+     /* We allocate the output same size as input, this is overkill.
+diff -r d33e0cf91556 Modules/datetimemodule.c
+--- a/Modules/datetimemodule.c
++++ b/Modules/datetimemodule.c
+@@ -613,7 +613,7 @@
+                 sizeof(_PyDateTime_BaseTime));
+     if (self == NULL)
+         return (PyObject *)PyErr_NoMemory();
+-    PyObject_INIT(self, type);
++    (void)PyObject_INIT(self, type);
+     return self;
+ }
+ 
+@@ -628,7 +628,7 @@
+                 sizeof(_PyDateTime_BaseDateTime));
+     if (self == NULL)
+         return (PyObject *)PyErr_NoMemory();
+-    PyObject_INIT(self, type);
++    (void)PyObject_INIT(self, type);
+     return self;
+ }
+ 
+diff -r d33e0cf91556 Modules/expat/pyexpatns.h
+--- a/Modules/expat/pyexpatns.h
++++ b/Modules/expat/pyexpatns.h
+@@ -21,7 +21,7 @@
+  *
+  *
+  * The Solution:
+- * Prefix all a exported symbols with "PyExpat_". This is similar to
++ * Prefix all exported symbols with "PyExpat_". This is similar to
+  * what Mozilla does for some common libs:
+  * http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115
+  *
+diff -r d33e0cf91556 Modules/expat/xmlparse.c
+--- a/Modules/expat/xmlparse.c
++++ b/Modules/expat/xmlparse.c
+@@ -2,12 +2,6 @@
+    See the file COPYING for copying permission.
+ */
+ 
+-#include 
+-#include                      /* memset(), memcpy() */
+-#include 
+-#include                      /* UINT_MAX */
+-#include                        /* time() */
+-
+ #define XML_BUILDING_EXPAT 1
+ 
+ #ifdef COMPILED_FROM_DSP
+@@ -22,6 +16,12 @@
+ #include 
+ #endif /* ndef COMPILED_FROM_DSP */
+ 
++#include 
++#include                      /* memset(), memcpy() */
++#include 
++#include                      /* UINT_MAX */
++#include                        /* time() */
++
+ #include "ascii.h"
+ #include "expat.h"
+ 
+diff -r d33e0cf91556 Modules/itertoolsmodule.c
+--- a/Modules/itertoolsmodule.c
++++ b/Modules/itertoolsmodule.c
+@@ -1747,7 +1747,7 @@
+ PyDoc_STRVAR(chain_from_iterable_doc,
+ "chain.from_iterable(iterable) --> chain object\n\
+ \n\
+-Alternate chain() contructor taking a single iterable argument\n\
++Alternate chain() constructor taking a single iterable argument\n\
+ that evaluates lazily.");
+ 
+ static PyMethodDef chain_methods[] = {
+diff -r d33e0cf91556 Modules/operator.c
+--- a/Modules/operator.c
++++ b/Modules/operator.c
+@@ -788,7 +788,7 @@
+ methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+     methodcallerobject *mc;
+-    PyObject *name, *newargs;
++    PyObject *name;
+ 
+     if (PyTuple_GET_SIZE(args) < 1) {
+         PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
+@@ -801,13 +801,6 @@
+     if (mc == NULL)
+         return NULL;
+ 
+-    newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
+-    if (newargs == NULL) {
+-        Py_DECREF(mc);
+-        return NULL;
+-    }
+-    mc->args = newargs;
+-
+     name = PyTuple_GET_ITEM(args, 0);
+     Py_INCREF(name);
+     mc->name = name;
+@@ -815,6 +808,12 @@
+     Py_XINCREF(kwds);
+     mc->kwds = kwds;
+ 
++    mc->args = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
++    if (mc->args == NULL) {
++        Py_DECREF(mc);
++        return NULL;
++    }
++
+     PyObject_GC_Track(mc);
+     return (PyObject *)mc;
+ }
+diff -r d33e0cf91556 Modules/posixmodule.c
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -1646,13 +1646,9 @@
+     PyObject *result;
+ 
+ #ifdef MS_WINDOWS
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, wformat, &po)) {
+-        Py_UNICODE *wpath = PyUnicode_AS_UNICODE(po);
+-
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, wformat, &wpath)) {
+         Py_BEGIN_ALLOW_THREADS
+-            /* PyUnicode_AS_UNICODE result OK without
+-               thread lock as it is a simple dereference. */
+         res = wstatfunc(wpath, &st);
+         Py_END_ALLOW_THREADS
+ 
+@@ -1706,12 +1702,10 @@
+ 
+ #ifdef MS_WINDOWS
+     DWORD attr;
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, "Ui:access", &po, &mode)) {
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "ui:access", &wpath, &mode)) {
+         Py_BEGIN_ALLOW_THREADS
+-        /* PyUnicode_AS_UNICODE OK without thread lock as
+-           it is a simple dereference. */
+-        attr = GetFileAttributesW(PyUnicode_AS_UNICODE(po));
++        attr = GetFileAttributesW(wpath);
+         Py_END_ALLOW_THREADS
+         goto finish;
+     }
+@@ -1858,23 +1852,22 @@
+     int res;
+ #ifdef MS_WINDOWS
+     DWORD attr;
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, "Ui|:chmod", &po, &i)) {
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "ui|:chmod", &wpath, &i)) {
+         Py_BEGIN_ALLOW_THREADS
+-        attr = GetFileAttributesW(PyUnicode_AS_UNICODE(po));
++        attr = GetFileAttributesW(wpath);
+         if (attr != 0xFFFFFFFF) {
+             if (i & _S_IWRITE)
+                 attr &= ~FILE_ATTRIBUTE_READONLY;
+             else
+                 attr |= FILE_ATTRIBUTE_READONLY;
+-            res = SetFileAttributesW(PyUnicode_AS_UNICODE(po), attr);
++            res = SetFileAttributesW(wpath, attr);
+         }
+         else
+             res = 0;
+         Py_END_ALLOW_THREADS
+         if (!res)
+-            return win32_error_unicode("chmod",
+-                                       PyUnicode_AS_UNICODE(po));
++            return win32_error_unicode("chmod", wpath);
+         Py_INCREF(Py_None);
+         return Py_None;
+     }
+@@ -2300,18 +2293,18 @@
+     char *bufptr = namebuf;
+     Py_ssize_t len = sizeof(namebuf)-5; /* only claim to have space for MAX_PATH */
+ 
+-    PyObject *po;
+-    if (PyArg_ParseTuple(args, "U:listdir", &po)) {
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "u:listdir", &wpath)) {
+         WIN32_FIND_DATAW wFileData;
+         Py_UNICODE *wnamebuf;
+         /* Overallocate for \\*.*\0 */
+-        len = PyUnicode_GET_SIZE(po);
++        len = wcslen(wpath);
+         wnamebuf = malloc((len + 5) * sizeof(wchar_t));
+         if (!wnamebuf) {
+             PyErr_NoMemory();
+             return NULL;
+         }
+-        wcscpy(wnamebuf, PyUnicode_AS_UNICODE(po));
++        wcscpy(wnamebuf, wpath);
+         if (len > 0) {
+             Py_UNICODE wch = wnamebuf[len-1];
+             if (wch != L'/' && wch != L'\\' && wch != L':')
+@@ -2615,9 +2608,8 @@
+     char outbuf[MAX_PATH*2];
+     char *temp;
+ 
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, "U|:_getfullpathname", &po)) {
+-        Py_UNICODE *wpath = PyUnicode_AS_UNICODE(po);
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "u|:_getfullpathname", &wpath)) {
+         Py_UNICODE woutbuf[MAX_PATH*2], *woutbufp = woutbuf;
+         Py_UNICODE *wtemp;
+         DWORD result;
+@@ -2670,15 +2662,13 @@
+     int mode = 0777;
+ 
+ #ifdef MS_WINDOWS
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, "U|i:mkdir", &po, &mode)) {
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "u|i:mkdir", &wpath, &mode)) {
+         Py_BEGIN_ALLOW_THREADS
+-        /* PyUnicode_AS_UNICODE OK without thread lock as
+-           it is a simple dereference. */
+-        res = CreateDirectoryW(PyUnicode_AS_UNICODE(po), NULL);
++        res = CreateDirectoryW(wpath, NULL);
+         Py_END_ALLOW_THREADS
+         if (!res)
+-            return win32_error_unicode("mkdir", PyUnicode_AS_UNICODE(po));
++            return win32_error_unicode("mkdir", wpath);
+         Py_INCREF(Py_None);
+         return Py_None;
+     }
+@@ -2689,8 +2679,6 @@
+                           Py_FileSystemDefaultEncoding, &path, &mode))
+         return NULL;
+     Py_BEGIN_ALLOW_THREADS
+-    /* PyUnicode_AS_UNICODE OK without thread lock as
+-       it is a simple dereference. */
+     res = CreateDirectoryA(path, NULL);
+     Py_END_ALLOW_THREADS
+     if (!res) {
+@@ -2833,7 +2821,7 @@
+ posix_stat(PyObject *self, PyObject *args)
+ {
+ #ifdef MS_WINDOWS
+-    return posix_do_stat(self, args, "et:stat", STAT, "U:stat", win32_wstat);
++    return posix_do_stat(self, args, "et:stat", STAT, "u:stat", win32_wstat);
+ #else
+     return posix_do_stat(self, args, "et:stat", STAT, NULL, NULL);
+ #endif
+@@ -2969,7 +2957,6 @@
+ {
+ #ifdef MS_WINDOWS
+     PyObject *arg;
+-    PyUnicodeObject *obwpath;
+     wchar_t *wpath = NULL;
+     char *apath = NULL;
+     HANDLE hFile;
+@@ -2978,8 +2965,7 @@
+     FILETIME atime, mtime;
+     PyObject *result = NULL;
+ 
+-    if (PyArg_ParseTuple(args, "UO|:utime", &obwpath, &arg)) {
+-        wpath = PyUnicode_AS_UNICODE(obwpath);
++    if (PyArg_ParseTuple(args, "uO|:utime", &wpath, &arg)) {
+         Py_BEGIN_ALLOW_THREADS
+         hFile = CreateFileW(wpath, FILE_WRITE_ATTRIBUTES, 0,
+                             NULL, OPEN_EXISTING,
+@@ -4440,14 +4426,11 @@
+ static PyObject *
+ posix__isdir(PyObject *self, PyObject *args)
+ {
+-    PyObject *opath;
+     char *path;
+-    PyUnicodeObject *po;
++    Py_UNICODE *wpath;
+     DWORD attributes;
+ 
+-    if (PyArg_ParseTuple(args, "U|:_isdir", &po)) {
+-        Py_UNICODE *wpath = PyUnicode_AS_UNICODE(po);
+-
++    if (PyArg_ParseTuple(args, "u|:_isdir", &wpath)) {
+         attributes = GetFileAttributesW(wpath);
+         if (attributes == INVALID_FILE_ATTRIBUTES)
+             Py_RETURN_FALSE;
+@@ -6326,7 +6309,7 @@
+     return posix_do_stat(self, args, "et:lstat", lstat, NULL, NULL);
+ #else /* !HAVE_LSTAT */
+ #ifdef MS_WINDOWS
+-    return posix_do_stat(self, args, "et:lstat", STAT, "U:lstat", win32_wstat);
++    return posix_do_stat(self, args, "et:lstat", STAT, "u:lstat", win32_wstat);
+ #else
+     return posix_do_stat(self, args, "et:lstat", STAT, NULL, NULL);
+ #endif
+@@ -6600,12 +6583,10 @@
+     int fd;
+ 
+ #ifdef MS_WINDOWS
+-    PyUnicodeObject *po;
+-    if (PyArg_ParseTuple(args, "Ui|i:mkdir", &po, &flag, &mode)) {
++    Py_UNICODE *wpath;
++    if (PyArg_ParseTuple(args, "ui|i:mkdir", &wpath, &flag, &mode)) {
+         Py_BEGIN_ALLOW_THREADS
+-        /* PyUnicode_AS_UNICODE OK without thread
+-           lock as it is a simple dereference. */
+-        fd = _wopen(PyUnicode_AS_UNICODE(po), flag, mode);
++        fd = _wopen(wpath, flag, mode);
+         Py_END_ALLOW_THREADS
+         if (fd < 0)
+             return posix_error();
+@@ -8662,12 +8643,13 @@
+ win32_startfile(PyObject *self, PyObject *args)
+ {
+     char *filepath;
++    Py_UNICODE *wpath;
+     char *operation = NULL;
+     HINSTANCE rc;
+ 
+-    PyObject *unipath, *woperation = NULL;
+-    if (!PyArg_ParseTuple(args, "U|s:startfile",
+-                          &unipath, &operation)) {
++    PyObject *woperation = NULL;
++    if (!PyArg_ParseTuple(args, "u|s:startfile",
++                          &wpath, &operation)) {
+         PyErr_Clear();
+         goto normal;
+     }
+@@ -8684,14 +8666,13 @@
+ 
+     Py_BEGIN_ALLOW_THREADS
+     rc = ShellExecuteW((HWND)0, woperation ? PyUnicode_AS_UNICODE(woperation) : 0,
+-        PyUnicode_AS_UNICODE(unipath),
++        wpath,
+         NULL, NULL, SW_SHOWNORMAL);
+     Py_END_ALLOW_THREADS
+ 
+     Py_XDECREF(woperation);
+     if (rc <= (HINSTANCE)32) {
+-        PyObject *errval = win32_error_unicode("startfile",
+-                                               PyUnicode_AS_UNICODE(unipath));
++        PyObject *errval = win32_error_unicode("startfile", wpath);
+         return errval;
+     }
+     Py_INCREF(Py_None);
+diff -r d33e0cf91556 Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -66,10 +66,11 @@
+ static int libedit_history_start = 0;
+ #endif /* __APPLE__ */
+ 
++#ifdef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK
+ static void
+ on_completion_display_matches_hook(char **matches,
+                                    int num_matches, int max_length);
+-
++#endif
+ 
+ /* Memory allocated for rl_completer_word_break_characters
+    (see issue #17289 for the motivation). */
+@@ -774,6 +775,7 @@
+ 
+ /* C function to call the Python completion_display_matches */
+ 
++#ifdef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK
+ static void
+ on_completion_display_matches_hook(char **matches,
+                                    int num_matches, int max_length)
+@@ -816,6 +818,7 @@
+ #endif
+ }
+ 
++#endif
+ 
+ #ifdef HAVE_RL_RESIZE_TERMINAL
+ static volatile sig_atomic_t sigwinch_received;
+@@ -958,19 +961,22 @@
+     begidx = PyInt_FromLong(0L);
+     endidx = PyInt_FromLong(0L);
+ 
+-#ifndef __APPLE__
+-    if (!isatty(STDOUT_FILENO)) {
+-        /* Issue #19884: stdout is not a terminal. Disable meta modifier
+-           keys to not write the ANSI sequence "\033[1034h" into stdout. On
+-           terminals supporting 8 bit characters like TERM=xterm-256color
+-           (which is now the default Fedora since Fedora 18), the meta key is
+-           used to enable support of 8 bit characters (ANSI sequence
+-           "\033[1034h").
++#ifdef __APPLE__
++    if (!using_libedit_emulation)
++#endif
++    {
++        if (!isatty(STDOUT_FILENO)) {
++            /* Issue #19884: stdout is not a terminal. Disable meta modifier
++               keys to not write the ANSI sequence "\033[1034h" into stdout. On
++               terminals supporting 8 bit characters like TERM=xterm-256color
++               (which is now the default Fedora since Fedora 18), the meta key is
++               used to enable support of 8 bit characters (ANSI sequence
++               "\033[1034h").
+ 
+-           With libedit, this call makes readline() crash. */
+-        rl_variable_bind ("enable-meta-key", "off");
++               With libedit, this call makes readline() crash. */
++            rl_variable_bind ("enable-meta-key", "off");
++        }
+     }
+-#endif
+ 
+     /* Initialize (allows .inputrc to override)
+      *
+@@ -1141,7 +1147,7 @@
+         return NULL;
+     }
+ 
+-    /* We got an EOF, return a empty string. */
++    /* We got an EOF, return an empty string. */
+     if (p == NULL) {
+         p = PyMem_Malloc(1);
+         if (p != NULL)
+diff -r d33e0cf91556 Modules/socketmodule.c
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -780,7 +780,7 @@
+ */
+ #define BEGIN_SELECT_LOOP(s) \
+     { \
+-        double deadline, interval = s->sock_timeout; \
++        double deadline = 0, interval = s->sock_timeout; \
+         int has_timeout = s->sock_timeout > 0.0; \
+         if (has_timeout) { \
+             deadline = _PyTime_FloatTime() + s->sock_timeout; \
+diff -r d33e0cf91556 Modules/tkappinit.c
+--- a/Modules/tkappinit.c
++++ b/Modules/tkappinit.c
+@@ -26,7 +26,9 @@
+ int
+ Tcl_AppInit(Tcl_Interp *interp)
+ {
++#ifdef WITH_MOREBUTTONS
+     Tk_Window main_window;
++#endif
+     const char *_tkinter_skip_tk_init;
+ #ifdef TKINTER_PROTECT_LOADTK
+     const char *_tkinter_tk_failed;
+@@ -111,7 +113,11 @@
+         return TCL_ERROR;
+     }
+ 
++#ifdef WITH_MOREBUTTONS
+     main_window = Tk_MainWindow(interp);
++#else
++    Tk_MainWindow(interp);
++#endif
+ 
+ #ifdef TK_AQUA
+     TkMacOSXInitAppleEvents(interp);
+diff -r d33e0cf91556 Modules/zlibmodule.c
+--- a/Modules/zlibmodule.c
++++ b/Modules/zlibmodule.c
+@@ -1,8 +1,9 @@
+ /* zlibmodule.c -- gzip-compatible data compression */
+-/* See http://www.gzip.org/zlib/ */
++/* See http://zlib.net/ */
+ 
+ /* Windows users:  read Python's PCbuild\readme.txt */
+ 
++#define PY_SSIZE_T_CLEAN
+ 
+ #include "Python.h"
+ #include "zlib.h"
+@@ -129,6 +130,71 @@
+     return self;
+ }
+ 
++static void
++arrange_input_buffer(z_stream *zst, Py_ssize_t *remains)
++{
++    if ((size_t)*remains > UINT_MAX) {
++        zst->avail_in = UINT_MAX;
++    } else {
++        zst->avail_in = *remains;
++    }
++    *remains -= zst->avail_in;
++}
++
++static Py_ssize_t
++arrange_output_buffer_with_maximum(z_stream *zst, PyObject **buffer,
++                                   Py_ssize_t length,
++                                   Py_ssize_t max_length)
++{
++    Py_ssize_t occupied;
++
++    if (*buffer == NULL) {
++        if (!(*buffer = PyBytes_FromStringAndSize(NULL, length)))
++            return -1;
++        occupied = 0;
++    }
++    else {
++        occupied = zst->next_out - (Byte *)PyBytes_AS_STRING(*buffer);
++
++        if (length == occupied) {
++            Py_ssize_t new_length;
++            assert(length <= max_length);
++            /* can not scale the buffer over max_length */
++            if (length == max_length)
++                return -2;
++            if (length <= (max_length >> 1))
++                new_length = length << 1;
++            else
++                new_length = max_length;
++            if (_PyBytes_Resize(buffer, new_length) < 0)
++                return -1;
++            length = new_length;
++        }
++    }
++
++    if ((size_t)(length - occupied) > UINT_MAX) {
++        zst->avail_out = UINT_MAX;
++    } else {
++        zst->avail_out = length - occupied;
++    }
++    zst->next_out = (Byte *)PyBytes_AS_STRING(*buffer) + occupied;
++
++    return length;
++}
++
++static Py_ssize_t
++arrange_output_buffer(z_stream *zst, PyObject **buffer, Py_ssize_t length)
++{
++    Py_ssize_t ret;
++
++    ret = arrange_output_buffer_with_maximum(zst, buffer, length,
++                                             PY_SSIZE_T_MAX);
++    if (ret == -2)
++        PyErr_NoMemory();
++
++    return ret;
++}
++
+ PyDoc_STRVAR(compress__doc__,
+ "compress(string[, level]) -- Returned compressed string.\n"
+ "\n"
+@@ -137,44 +203,31 @@
+ static PyObject *
+ PyZlib_compress(PyObject *self, PyObject *args)
+ {
+-    PyObject *ReturnVal = NULL;
+-    Byte *input, *output;
+-    int length, level=Z_DEFAULT_COMPRESSION, err;
++    PyObject *RetVal = NULL;
++    Byte *ibuf;
++    Py_ssize_t ibuflen, obuflen = DEFAULTALLOC;
++    int level=Z_DEFAULT_COMPRESSION;
++    int err, flush;
+     z_stream zst;
+ 
+     /* require Python string object, optional 'level' arg */
+-    if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
++    if (!PyArg_ParseTuple(args, "s#|i:compress", &ibuf, &ibuflen, &level))
+         return NULL;
+ 
+-    zst.avail_out = length + length/1000 + 12 + 1;
+-
+-    output = (Byte*)malloc(zst.avail_out);
+-    if (output == NULL) {
+-        PyErr_SetString(PyExc_MemoryError,
+-                        "Can't allocate memory to compress data");
+-        return NULL;
+-    }
+-
+-    /* Past the point of no return.  From here on out, we need to make sure
+-       we clean up mallocs & INCREFs. */
+-
+     zst.zalloc = (alloc_func)NULL;
+     zst.zfree = (free_func)Z_NULL;
+-    zst.next_out = (Byte *)output;
+-    zst.next_in = (Byte *)input;
+-    zst.avail_in = length;
++    zst.next_in = ibuf;
+     err = deflateInit(&zst, level);
+ 
+-    switch(err) {
+-    case(Z_OK):
++    switch (err) {
++    case Z_OK:
+         break;
+-    case(Z_MEM_ERROR):
++    case Z_MEM_ERROR:
+         PyErr_SetString(PyExc_MemoryError,
+                         "Out of memory while compressing data");
+         goto error;
+-    case(Z_STREAM_ERROR):
+-        PyErr_SetString(ZlibError,
+-                        "Bad compression level");
++    case Z_STREAM_ERROR:
++        PyErr_SetString(ZlibError, "Bad compression level");
+         goto error;
+     default:
+         deflateEnd(&zst);
+@@ -182,27 +235,45 @@
+         goto error;
+     }
+ 
+-    Py_BEGIN_ALLOW_THREADS;
+-    err = deflate(&zst, Z_FINISH);
+-    Py_END_ALLOW_THREADS;
++    do {
++        arrange_input_buffer(&zst, &ibuflen);
++        flush = ibuflen == 0 ? Z_FINISH : Z_NO_FLUSH;
+ 
+-    if (err != Z_STREAM_END) {
+-        zlib_error(zst, err, "while compressing data");
+-        deflateEnd(&zst);
+-        goto error;
++        do {
++            obuflen = arrange_output_buffer(&zst, &RetVal, obuflen);
++            if (obuflen < 0) {
++                deflateEnd(&zst);
++                goto error;
++            }
++
++            Py_BEGIN_ALLOW_THREADS
++            err = deflate(&zst, flush);
++            Py_END_ALLOW_THREADS
++
++            if (err == Z_STREAM_ERROR) {
++                deflateEnd(&zst);
++                zlib_error(zst, err, "while compressing data");
++                goto error;
++            }
++
++        } while (zst.avail_out == 0);
++        assert(zst.avail_in == 0);
++
++    } while (flush != Z_FINISH);
++    assert(err == Z_STREAM_END);
++
++    err = deflateEnd(&zst);
++    if (err == Z_OK) {
++        if (_PyBytes_Resize(&RetVal, zst.next_out -
++                            (Byte *)PyBytes_AS_STRING(RetVal)) < 0)
++            goto error;
++        return RetVal;
+     }
+-
+-    err=deflateEnd(&zst);
+-    if (err == Z_OK)
+-        ReturnVal = PyString_FromStringAndSize((char *)output,
+-                                               zst.total_out);
+     else
+         zlib_error(zst, err, "while finishing compression");
+-
+  error:
+-    free(output);
+-
+-    return ReturnVal;
++    Py_XDECREF(RetVal);
++    return NULL;
+ }
+ 
+ PyDoc_STRVAR(decompress__doc__,
+@@ -214,36 +285,32 @@
+ static PyObject *
+ PyZlib_decompress(PyObject *self, PyObject *args)
+ {
+-    PyObject *result_str;
+-    Byte *input;
+-    int length, err;
++    PyObject *RetVal = NULL;
++    Byte *ibuf;
++    Py_ssize_t ibuflen;
++    int err, flush;
+     int wsize=DEF_WBITS;
+     Py_ssize_t r_strlen=DEFAULTALLOC;
+     z_stream zst;
+ 
+     if (!PyArg_ParseTuple(args, "s#|in:decompress",
+-                          &input, &length, &wsize, &r_strlen))
++                          &ibuf, &ibuflen, &wsize, &r_strlen))
+         return NULL;
+ 
+-    if (r_strlen <= 0)
++    if (r_strlen <= 0) {
+         r_strlen = 1;
+-
+-    zst.avail_in = length;
+-    zst.avail_out = r_strlen;
+-
+-    if (!(result_str = PyString_FromStringAndSize(NULL, r_strlen)))
+-        return NULL;
++    }
+ 
+     zst.zalloc = (alloc_func)NULL;
+     zst.zfree = (free_func)Z_NULL;
+-    zst.next_out = (Byte *)PyString_AS_STRING(result_str);
+-    zst.next_in = (Byte *)input;
++    zst.avail_in = 0;
++    zst.next_in = ibuf;
+     err = inflateInit2(&zst, wsize);
+ 
+-    switch(err) {
+-    case(Z_OK):
++    switch (err) {
++    case Z_OK:
+         break;
+-    case(Z_MEM_ERROR):
++    case Z_MEM_ERROR:
+         PyErr_SetString(PyExc_MemoryError,
+                         "Out of memory while decompressing data");
+         goto error;
+@@ -254,42 +321,46 @@
+     }
+ 
+     do {
+-        Py_BEGIN_ALLOW_THREADS
+-        err=inflate(&zst, Z_FINISH);
+-        Py_END_ALLOW_THREADS
++        arrange_input_buffer(&zst, &ibuflen);
++        flush = ibuflen == 0 ? Z_FINISH : Z_NO_FLUSH;
+ 
+-        switch(err) {
+-        case(Z_STREAM_END):
+-            break;
+-        case(Z_BUF_ERROR):
+-            /*
+-             * If there is at least 1 byte of room according to zst.avail_out
+-             * and we get this error, assume that it means zlib cannot
+-             * process the inflate call() due to an error in the data.
+-             */
+-            if (zst.avail_out > 0) {
+-                zlib_error(zst, err, "while decompressing data");
++        do {
++            r_strlen = arrange_output_buffer(&zst, &RetVal, r_strlen);
++            if (r_strlen < 0) {
+                 inflateEnd(&zst);
+                 goto error;
+             }
+-            /* fall through */
+-        case(Z_OK):
+-            /* need more memory */
+-            if (_PyString_Resize(&result_str, r_strlen << 1) < 0) {
++
++            Py_BEGIN_ALLOW_THREADS
++            err = inflate(&zst, flush);
++            Py_END_ALLOW_THREADS
++
++            switch (err) {
++            case Z_OK:            /* fall through */
++            case Z_BUF_ERROR:     /* fall through */
++            case Z_STREAM_END:
++                break;
++            case Z_MEM_ERROR:
+                 inflateEnd(&zst);
++                PyErr_SetString(PyExc_MemoryError,
++                                "Out of memory while decompressing data");
++                goto error;
++            default:
++                inflateEnd(&zst);
++                zlib_error(zst, err, "while decompressing data");
+                 goto error;
+             }
+-            zst.next_out = (unsigned char *)PyString_AS_STRING(result_str) \
+-                + r_strlen;
+-            zst.avail_out = r_strlen;
+-            r_strlen = r_strlen << 1;
+-            break;
+-        default:
+-            inflateEnd(&zst);
+-            zlib_error(zst, err, "while decompressing data");
+-            goto error;
+-        }
+-    } while (err != Z_STREAM_END);
++
++        } while (zst.avail_out == 0);
++
++    } while (err != Z_STREAM_END && ibuflen != 0);
++
++
++    if (err != Z_STREAM_END) {
++        inflateEnd(&zst);
++        zlib_error(zst, err, "while decompressing data");
++        goto error;
++    }
+ 
+     err = inflateEnd(&zst);
+     if (err != Z_OK) {
+@@ -297,11 +368,12 @@
+         goto error;
+     }
+ 
+-    _PyString_Resize(&result_str, zst.total_out);
+-    return result_str;
++    _PyString_Resize(&RetVal, zst.next_out -
++                        (Byte *)PyBytes_AS_STRING(RetVal));
++    return RetVal;
+ 
+  error:
+-    Py_XDECREF(result_str);
++    Py_XDECREF(RetVal);
+     return NULL;
+ }
+ 
+@@ -317,23 +389,23 @@
+         return NULL;
+ 
+     self = newcompobject(&Comptype);
+-    if (self==NULL)
++    if (self == NULL)
+         return(NULL);
+     self->zst.zalloc = (alloc_func)NULL;
+     self->zst.zfree = (free_func)Z_NULL;
+     self->zst.next_in = NULL;
+     self->zst.avail_in = 0;
+     err = deflateInit2(&self->zst, level, method, wbits, memLevel, strategy);
+-    switch(err) {
+-    case (Z_OK):
++    switch (err) {
++    case Z_OK:
+         self->is_initialised = 1;
+-        return (PyObject*)self;
+-    case (Z_MEM_ERROR):
++        return (PyObject *)self;
++    case Z_MEM_ERROR:
+         Py_DECREF(self);
+         PyErr_SetString(PyExc_MemoryError,
+                         "Can't allocate memory for compression object");
+         return NULL;
+-    case(Z_STREAM_ERROR):
++    case Z_STREAM_ERROR:
+         Py_DECREF(self);
+         PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
+         return NULL;
+@@ -354,21 +426,21 @@
+ 
+     self = newcompobject(&Decomptype);
+     if (self == NULL)
+-        return(NULL);
++        return NULL;
+     self->zst.zalloc = (alloc_func)NULL;
+     self->zst.zfree = (free_func)Z_NULL;
+     self->zst.next_in = NULL;
+     self->zst.avail_in = 0;
+     err = inflateInit2(&self->zst, wbits);
+-    switch(err) {
+-    case (Z_OK):
++    switch (err) {
++    case Z_OK:
+         self->is_initialised = 1;
+-        return (PyObject*)self;
+-    case(Z_STREAM_ERROR):
++        return (PyObject *)self;
++    case Z_STREAM_ERROR:
+         Py_DECREF(self);
+         PyErr_SetString(PyExc_ValueError, "Invalid initialization option");
+         return NULL;
+-    case (Z_MEM_ERROR):
++    case Z_MEM_ERROR:
+         Py_DECREF(self);
+         PyErr_SetString(PyExc_MemoryError,
+                         "Can't allocate memory for decompression object");
+@@ -411,58 +483,44 @@
+ static PyObject *
+ PyZlib_objcompress(compobject *self, PyObject *args)
+ {
+-    int err, inplen;
+-    Py_ssize_t length = DEFAULTALLOC;
+-    PyObject *RetVal;
+-    Byte *input;
+-    unsigned long start_total_out;
++    PyObject *RetVal = NULL;
++    Py_ssize_t ibuflen, obuflen = DEFAULTALLOC;
++    int err;
+ 
+-    if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
+-        return NULL;
+-
+-    if (!(RetVal = PyString_FromStringAndSize(NULL, length)))
++    if (!PyArg_ParseTuple(args, "s#:compress", &self->zst.next_in, &ibuflen))
+         return NULL;
+ 
+     ENTER_ZLIB
+ 
+-    start_total_out = self->zst.total_out;
+-    self->zst.avail_in = inplen;
+-    self->zst.next_in = input;
+-    self->zst.avail_out = length;
+-    self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
++    do {
++        arrange_input_buffer(&self->zst, &ibuflen);
+ 
+-    Py_BEGIN_ALLOW_THREADS
+-    err = deflate(&(self->zst), Z_NO_FLUSH);
+-    Py_END_ALLOW_THREADS
++        do {
++            obuflen = arrange_output_buffer(&self->zst, &RetVal, obuflen);
++            if (obuflen < 0)
++                goto error;
+ 
+-    /* while Z_OK and the output buffer is full, there might be more output,
+-       so extend the output buffer and try again */
+-    while (err == Z_OK && self->zst.avail_out == 0) {
+-        if (_PyString_Resize(&RetVal, length << 1) < 0)
+-            goto error;
+-        self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+-            + length;
+-        self->zst.avail_out = length;
+-        length = length << 1;
++            Py_BEGIN_ALLOW_THREADS
++            err = deflate(&self->zst, Z_NO_FLUSH);
++            Py_END_ALLOW_THREADS
+ 
+-        Py_BEGIN_ALLOW_THREADS
+-        err = deflate(&(self->zst), Z_NO_FLUSH);
+-        Py_END_ALLOW_THREADS
+-    }
+-    /* We will only get Z_BUF_ERROR if the output buffer was full but
+-       there wasn't more output when we tried again, so it is not an error
+-       condition.
+-    */
++            if (err == Z_STREAM_ERROR) {
++                zlib_error(self->zst, err, "while compressing data");
++                goto error;
++            }
+ 
+-    if (err != Z_OK && err != Z_BUF_ERROR) {
+-        zlib_error(self->zst, err, "while compressing");
+-        Py_DECREF(RetVal);
+-        RetVal = NULL;
+-        goto error;
+-    }
+-    _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
++        } while (self->zst.avail_out == 0);
++        assert(self->zst.avail_in == 0);
++
++    } while (ibuflen != 0);
++
++    _PyString_Resize(&RetVal, self->zst.next_out -
++                        (Byte *)PyBytes_AS_STRING(RetVal));
++    goto success;
+ 
+  error:
++    Py_CLEAR(RetVal);
++ success:
+     LEAVE_ZLIB
+     return RetVal;
+ }
+@@ -470,41 +528,46 @@
+ /* Helper for objdecompress() and unflush(). Saves any unconsumed input data in
+    self->unused_data or self->unconsumed_tail, as appropriate. */
+ static int
+-save_unconsumed_input(compobject *self, int err)
++save_unconsumed_input(compobject *self, Byte *input, Py_ssize_t inplen,
++    int err)
+ {
+     if (err == Z_STREAM_END) {
+         /* The end of the compressed data has been reached. Store the leftover
+            input data in self->unused_data. */
+         if (self->zst.avail_in > 0) {
+             Py_ssize_t old_size = PyString_GET_SIZE(self->unused_data);
+-            Py_ssize_t new_size;
++            Py_ssize_t new_size, left_size;
+             PyObject *new_data;
+-            if (self->zst.avail_in > PY_SSIZE_T_MAX - old_size) {
++            left_size = input + inplen - self->zst.next_in;
++            if (left_size > (PY_SSIZE_T_MAX - old_size)) {
+                 PyErr_NoMemory();
+                 return -1;
+             }
+-            new_size = old_size + self->zst.avail_in;
++            new_size = old_size + left_size;
+             new_data = PyString_FromStringAndSize(NULL, new_size);
+             if (new_data == NULL)
+                 return -1;
+             Py_MEMCPY(PyString_AS_STRING(new_data),
+                       PyString_AS_STRING(self->unused_data), old_size);
+             Py_MEMCPY(PyString_AS_STRING(new_data) + old_size,
+-                      self->zst.next_in, self->zst.avail_in);
++                      self->zst.next_in, left_size);
+             Py_SETREF(self->unused_data, new_data);
+             self->zst.avail_in = 0;
+         }
+     }
++
+     if (self->zst.avail_in > 0 || PyString_GET_SIZE(self->unconsumed_tail)) {
+         /* This code handles two distinct cases:
+            1. Output limit was reached. Save leftover input in unconsumed_tail.
+            2. All input data was consumed. Clear unconsumed_tail. */
++        Py_ssize_t left_size = input + inplen - self->zst.next_in;
+         PyObject *new_data = PyString_FromStringAndSize(
+-                (char *)self->zst.next_in, self->zst.avail_in);
++                (char *)self->zst.next_in, left_size);
+         if (new_data == NULL)
+             return -1;
+         Py_SETREF(self->unconsumed_tail, new_data);
+     }
++
+     return 0;
+ }
+ 
+@@ -522,71 +585,69 @@
+ static PyObject *
+ PyZlib_objdecompress(compobject *self, PyObject *args)
+ {
+-    int err, inplen, max_length = 0;
+-    Py_ssize_t old_length, length = DEFAULTALLOC;
+-    PyObject *RetVal;
++    int err = Z_OK;
++    Py_ssize_t inplen, max_length = 0;
++    Py_ssize_t ibuflen, obuflen = DEFAULTALLOC, hard_limit;
++    PyObject *RetVal = NULL;
+     Byte *input;
+-    unsigned long start_total_out;
+ 
+-    if (!PyArg_ParseTuple(args, "s#|i:decompress", &input,
++    if (!PyArg_ParseTuple(args, "s#|n:decompress", &input,
+                           &inplen, &max_length))
+         return NULL;
+     if (max_length < 0) {
+         PyErr_SetString(PyExc_ValueError,
+                         "max_length must be greater than zero");
+         return NULL;
+-    }
++    } else if (max_length == 0)
++        hard_limit = PY_SSIZE_T_MAX;
++    else
++        hard_limit = max_length;
++
++    self->zst.next_in = input;
++    ibuflen = inplen;
+ 
+     /* limit amount of data allocated to max_length */
+-    if (max_length && length > max_length)
+-        length = max_length;
+-    if (!(RetVal = PyString_FromStringAndSize(NULL, length)))
+-        return NULL;
++    if (max_length && obuflen > max_length)
++        obuflen = max_length;
+ 
+     ENTER_ZLIB
+ 
+-    start_total_out = self->zst.total_out;
+-    self->zst.avail_in = inplen;
+-    self->zst.next_in = input;
+-    self->zst.avail_out = length;
+-    self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
++    do {
++        arrange_input_buffer(&self->zst, &ibuflen);
+ 
+-    Py_BEGIN_ALLOW_THREADS
+-    err = inflate(&(self->zst), Z_SYNC_FLUSH);
+-    Py_END_ALLOW_THREADS
++        do {
++            obuflen = arrange_output_buffer_with_maximum(&self->zst, &RetVal,
++                                                         obuflen, hard_limit);
++            if (obuflen == -2) {
++                if (max_length > 0) {
++                    goto save;
++                }
++                PyErr_NoMemory();
++            }
++            if (obuflen < 0) {
++                goto abort;
++            }
+ 
+-    /* While Z_OK and the output buffer is full, there might be more output.
+-       So extend the output buffer and try again.
+-    */
+-    while (err == Z_OK && self->zst.avail_out == 0) {
+-        /* If max_length set, don't continue decompressing if we've already
+-           reached the limit.
+-        */
+-        if (max_length && length >= max_length)
+-            break;
++            Py_BEGIN_ALLOW_THREADS
++            err = inflate(&self->zst, Z_SYNC_FLUSH);
++            Py_END_ALLOW_THREADS
+ 
+-        /* otherwise, ... */
+-        old_length = length;
+-        length = length << 1;
+-        if (max_length && length > max_length)
+-            length = max_length;
++            switch (err) {
++            case Z_OK:            /* fall through */
++            case Z_BUF_ERROR:     /* fall through */
++            case Z_STREAM_END:
++                break;
++            default:
++                goto save;
++            }
+ 
+-        if (_PyString_Resize(&RetVal, length) < 0)
+-            goto error;
+-        self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+-            + old_length;
+-        self->zst.avail_out = length - old_length;
++        } while (self->zst.avail_out == 0);
+ 
+-        Py_BEGIN_ALLOW_THREADS
+-        err = inflate(&(self->zst), Z_SYNC_FLUSH);
+-        Py_END_ALLOW_THREADS
+-    }
++    } while (err != Z_STREAM_END && ibuflen != 0);
+ 
+-    if (save_unconsumed_input(self, err) < 0) {
+-        Py_DECREF(RetVal);
+-        RetVal = NULL;
+-        goto error;
+-    }
++ save:
++    if (save_unconsumed_input(self, input, inplen, err) < 0)
++        goto abort;
+ 
+     /* This is the logical place to call inflateEnd, but the old behaviour of
+        only calling it on flush() is preserved. */
+@@ -597,14 +658,16 @@
+            not an error condition.
+         */
+         zlib_error(self->zst, err, "while decompressing");
+-        Py_DECREF(RetVal);
+-        RetVal = NULL;
+-        goto error;
++        goto abort;
+     }
+ 
+-    _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
++    _PyString_Resize(&RetVal, self->zst.next_out -
++                        (Byte *)PyBytes_AS_STRING(RetVal));
++    goto success;
+ 
+- error:
++ abort:
++    Py_CLEAR(RetVal);
++ success:
+     LEAVE_ZLIB
+ 
+     return RetVal;
+@@ -621,10 +684,10 @@
+ static PyObject *
+ PyZlib_flush(compobject *self, PyObject *args)
+ {
+-    int err, length = DEFAULTALLOC;
+-    PyObject *RetVal;
++    int err;
++    Py_ssize_t length = DEFAULTALLOC;
++    PyObject *RetVal = NULL;
+     int flushmode = Z_FINISH;
+-    unsigned long start_total_out;
+ 
+     if (!PyArg_ParseTuple(args, "|i:flush", &flushmode))
+         return NULL;
+@@ -635,44 +698,37 @@
+         return PyString_FromStringAndSize(NULL, 0);
+     }
+ 
+-    if (!(RetVal = PyString_FromStringAndSize(NULL, length)))
+-        return NULL;
+-
+     ENTER_ZLIB
+ 
+-    start_total_out = self->zst.total_out;
+     self->zst.avail_in = 0;
+-    self->zst.avail_out = length;
+-    self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
+ 
+-    Py_BEGIN_ALLOW_THREADS
+-    err = deflate(&(self->zst), flushmode);
+-    Py_END_ALLOW_THREADS
+-
+-    /* while Z_OK and the output buffer is full, there might be more output,
+-       so extend the output buffer and try again */
+-    while (err == Z_OK && self->zst.avail_out == 0) {
+-        if (_PyString_Resize(&RetVal, length << 1) < 0)
++    do {
++        length = arrange_output_buffer(&self->zst, &RetVal, length);
++        if (length < 0) {
++            Py_CLEAR(RetVal);
+             goto error;
+-        self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+-            + length;
+-        self->zst.avail_out = length;
+-        length = length << 1;
++        }
+ 
+         Py_BEGIN_ALLOW_THREADS
+-        err = deflate(&(self->zst), flushmode);
++        err = deflate(&self->zst, flushmode);
+         Py_END_ALLOW_THREADS
+-    }
++
++        if (err == Z_STREAM_ERROR) {
++            zlib_error(self->zst, err, "while flushing");
++            Py_CLEAR(RetVal);
++            goto error;
++        }
++    } while (self->zst.avail_out == 0);
++    assert(self->zst.avail_in == 0);
+ 
+     /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
+        various data structures. Note we should only get Z_STREAM_END when
+        flushmode is Z_FINISH, but checking both for safety*/
+     if (err == Z_STREAM_END && flushmode == Z_FINISH) {
+-        err = deflateEnd(&(self->zst));
++        err = deflateEnd(&self->zst);
+         if (err != Z_OK) {
+             zlib_error(self->zst, err, "from deflateEnd()");
+-            Py_DECREF(RetVal);
+-            RetVal = NULL;
++            Py_CLEAR(RetVal);
+             goto error;
+         }
+         else
+@@ -682,18 +738,17 @@
+            but there wasn't more output when we tried again, so it is
+            not an error condition.
+         */
+-    } else if (err!=Z_OK && err!=Z_BUF_ERROR) {
++    } else if (err != Z_OK && err != Z_BUF_ERROR) {
+         zlib_error(self->zst, err, "while flushing");
+-        Py_DECREF(RetVal);
+-        RetVal = NULL;
++        Py_CLEAR(RetVal);
+         goto error;
+     }
+ 
+-    _PyString_Resize(&RetVal, self->zst.total_out - start_total_out);
++    _PyString_Resize(&RetVal, self->zst.next_out -
++                        (Byte *)PyBytes_AS_STRING(RetVal));
+ 
+  error:
+     LEAVE_ZLIB
+-
+     return RetVal;
+ }
+ 
+@@ -715,13 +770,13 @@
+      */
+     ENTER_ZLIB
+     err = deflateCopy(&retval->zst, &self->zst);
+-    switch(err) {
+-    case(Z_OK):
++    switch (err) {
++    case Z_OK:
+         break;
+-    case(Z_STREAM_ERROR):
++    case Z_STREAM_ERROR:
+         PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
+         goto error;
+-    case(Z_MEM_ERROR):
++    case Z_MEM_ERROR:
+         PyErr_SetString(PyExc_MemoryError,
+                         "Can't allocate memory for compression object");
+         goto error;
+@@ -764,13 +819,13 @@
+      */
+     ENTER_ZLIB
+     err = inflateCopy(&retval->zst, &self->zst);
+-    switch(err) {
+-    case(Z_OK):
++    switch (err) {
++    case Z_OK:
+         break;
+-    case(Z_STREAM_ERROR):
++    case Z_STREAM_ERROR:
+         PyErr_SetString(PyExc_ValueError, "Inconsistent stream state");
+         goto error;
+-    case(Z_MEM_ERROR):
++    case Z_MEM_ERROR:
+         PyErr_SetString(PyExc_MemoryError,
+                         "Can't allocate memory for decompression object");
+         goto error;
+@@ -807,73 +862,76 @@
+ static PyObject *
+ PyZlib_unflush(compobject *self, PyObject *args)
+ {
+-    int err, length = DEFAULTALLOC;
+-    PyObject * retval = NULL;
+-    unsigned long start_total_out;
++    Py_ssize_t length = DEFAULTALLOC;
++    int err, flush;
++    PyObject *RetVal = NULL;
++    Py_ssize_t ibuflen;
+ 
+-    if (!PyArg_ParseTuple(args, "|i:flush", &length))
++    if (!PyArg_ParseTuple(args, "|n:flush", &length))
+         return NULL;
+     if (length <= 0) {
+         PyErr_SetString(PyExc_ValueError, "length must be greater than zero");
+         return NULL;
+     }
+-    if (!(retval = PyString_FromStringAndSize(NULL, length)))
+-        return NULL;
+-
+ 
+     ENTER_ZLIB
+ 
+-    start_total_out = self->zst.total_out;
+-    self->zst.avail_in = PyString_GET_SIZE(self->unconsumed_tail);
+     self->zst.next_in = (Byte *)PyString_AS_STRING(self->unconsumed_tail);
+-    self->zst.avail_out = length;
+-    self->zst.next_out = (Byte *)PyString_AS_STRING(retval);
++    ibuflen = PyString_GET_SIZE(self->unconsumed_tail);
+ 
+-    Py_BEGIN_ALLOW_THREADS
+-    err = inflate(&(self->zst), Z_FINISH);
+-    Py_END_ALLOW_THREADS
++    do {
++        arrange_input_buffer(&self->zst, &ibuflen);
++        flush = ibuflen == 0 ? Z_FINISH : Z_NO_FLUSH;
+ 
+-    /* while Z_OK and the output buffer is full, there might be more output,
+-       so extend the output buffer and try again */
+-    while ((err == Z_OK || err == Z_BUF_ERROR) && self->zst.avail_out == 0) {
+-        if (_PyString_Resize(&retval, length << 1) < 0)
+-            goto error;
+-        self->zst.next_out = (Byte *)PyString_AS_STRING(retval) + length;
+-        self->zst.avail_out = length;
+-        length = length << 1;
++        do {
++            length = arrange_output_buffer(&self->zst, &RetVal, length);
++            if (length < 0)
++                goto abort;
+ 
+-        Py_BEGIN_ALLOW_THREADS
+-        err = inflate(&(self->zst), Z_FINISH);
+-        Py_END_ALLOW_THREADS
+-    }
++            Py_BEGIN_ALLOW_THREADS
++            err = inflate(&self->zst, flush);
++            Py_END_ALLOW_THREADS
+ 
+-    if (save_unconsumed_input(self, err) < 0) {
+-        Py_DECREF(retval);
+-        retval = NULL;
+-        goto error;
+-    }
++            switch (err) {
++            case Z_OK:            /* fall through */
++            case Z_BUF_ERROR:     /* fall through */
++            case Z_STREAM_END:
++                break;
++            default:
++                goto save;
++            }
++
++        } while (self->zst.avail_out == 0);
++
++    } while (err != Z_STREAM_END && ibuflen != 0);
++
++ save:
++    if (save_unconsumed_input(self,
++            (Byte *)PyString_AS_STRING(self->unconsumed_tail),
++            PyString_GET_SIZE(self->unconsumed_tail), err) < 0)
++        goto abort;
+ 
+     /* If flushmode is Z_FINISH, we also have to call deflateEnd() to free
+        various data structures. Note we should only get Z_STREAM_END when
+        flushmode is Z_FINISH */
+     if (err == Z_STREAM_END) {
+-        err = inflateEnd(&(self->zst));
++        err = inflateEnd(&self->zst);
+         self->is_initialised = 0;
+         if (err != Z_OK) {
+             zlib_error(self->zst, err, "from inflateEnd()");
+-            Py_DECREF(retval);
+-            retval = NULL;
+-            goto error;
++            goto abort;
+         }
+     }
+ 
+-    _PyString_Resize(&retval, self->zst.total_out - start_total_out);
++    _PyString_Resize(&RetVal, self->zst.next_out -
++                        (Byte *)PyBytes_AS_STRING(RetVal));
++    goto success;
+ 
+-error:
+-
++ abort:
++    Py_CLEAR(RetVal);
++ success:
+     LEAVE_ZLIB
+-
+-    return retval;
++    return RetVal;
+ }
+ 
+ static PyMethodDef comp_methods[] =
+@@ -943,15 +1001,24 @@
+ {
+     unsigned int adler32val = 1;  /* adler32(0L, Z_NULL, 0) */
+     Byte *buf;
+-    int len, signed_val;
++    Py_ssize_t len;
++    int signed_val;
+ 
+     if (!PyArg_ParseTuple(args, "s#|I:adler32", &buf, &len, &adler32val))
+         return NULL;
++
++    /* Avoid truncation of length for very large buffers. adler32() takes
++       length as an unsigned int, which may be narrower than Py_ssize_t. */
++    while ((size_t)len > UINT_MAX) {
++        adler32val = adler32(adler32val, buf, UINT_MAX);
++        buf += (size_t) UINT_MAX;
++        len -= (size_t) UINT_MAX;
++    }
+     /* In Python 2.x we return a signed integer regardless of native platform
+      * long size (the 32bit unsigned long is treated as 32-bit signed and sign
+      * extended into a 64-bit long inside the integer object).  3.0 does the
+      * right thing and returns unsigned. http://bugs.python.org/issue1202 */
+-    signed_val = adler32(adler32val, buf, len);
++    signed_val = adler32(adler32val, buf, (unsigned int)len);
+     return PyInt_FromLong(signed_val);
+ }
+ 
+@@ -966,15 +1033,24 @@
+ {
+     unsigned int crc32val = 0;  /* crc32(0L, Z_NULL, 0) */
+     Byte *buf;
+-    int len, signed_val;
++    Py_ssize_t len;
++    int signed_val;
+ 
+     if (!PyArg_ParseTuple(args, "s#|I:crc32", &buf, &len, &crc32val))
+         return NULL;
++
++    /* Avoid truncation of length for very large buffers. crc32() takes
++       length as an unsigned int, which may be narrower than Py_ssize_t. */
++    while ((size_t)len > UINT_MAX) {
++        crc32val = crc32(crc32val, buf, UINT_MAX);
++        buf += (size_t) UINT_MAX;
++        len -= (size_t) UINT_MAX;
++    }
+     /* In Python 2.x we return a signed integer regardless of native platform
+      * long size (the 32bit unsigned long is treated as 32-bit signed and sign
+      * extended into a 64-bit long inside the integer object).  3.0 does the
+      * right thing and returns unsigned. http://bugs.python.org/issue1202 */
+-    signed_val = crc32(crc32val, buf, len);
++    signed_val = crc32(crc32val, buf, (unsigned int)len);
+     return PyInt_FromLong(signed_val);
+ }
+ 
+diff -r d33e0cf91556 Objects/abstract.c
+--- a/Objects/abstract.c
++++ b/Objects/abstract.c
+@@ -1641,7 +1641,7 @@
+         }
+         return res;
+     }
+-    if (PyInt_Check(o)) { /* A int subclass without nb_int */
++    if (PyInt_Check(o)) { /* An int subclass without nb_int */
+         PyIntObject *io = (PyIntObject*)o;
+         return PyInt_FromLong(io->ob_ival);
+     }
+@@ -2211,21 +2211,22 @@
+             break;
+         }
+         if (j >= n) {
+-            Py_ssize_t oldn = n;
++            size_t newn = (size_t)n;
+             /* The over-allocation strategy can grow a bit faster
+                than for lists because unlike lists the
+                over-allocation isn't permanent -- we reclaim
+                the excess before the end of this routine.
+                So, grow by ten and then add 25%.
+             */
+-            n += 10;
+-            n += n >> 2;
+-            if (n < oldn) {
++            newn += 10u;
++            newn += newn >> 2;
++            if (newn > PY_SSIZE_T_MAX) {
+                 /* Check for overflow */
+                 PyErr_NoMemory();
+                 Py_DECREF(item);
+                 goto Fail;
+             }
++            n = (Py_ssize_t)newn;
+             if (_PyTuple_Resize(&result, n) != 0) {
+                 Py_DECREF(item);
+                 goto Fail;
+diff -r d33e0cf91556 Objects/bytearrayobject.c
+--- a/Objects/bytearrayobject.c
++++ b/Objects/bytearrayobject.c
+@@ -273,7 +273,6 @@
+ PyObject *
+ PyByteArray_Concat(PyObject *a, PyObject *b)
+ {
+-    Py_ssize_t size;
+     Py_buffer va, vb;
+     PyByteArrayObject *result = NULL;
+ 
+@@ -286,13 +285,13 @@
+             goto done;
+     }
+ 
+-    size = va.len + vb.len;
+-    if (size < 0) {
+-            PyErr_NoMemory();
+-            goto done;
++    if (va.len > PY_SSIZE_T_MAX - vb.len) {
++        PyErr_NoMemory();
++        goto done;
+     }
+ 
+-    result = (PyByteArrayObject *) PyByteArray_FromStringAndSize(NULL, size);
++    result = (PyByteArrayObject *) \
++        PyByteArray_FromStringAndSize(NULL, va.len + vb.len);
+     if (result != NULL) {
+         memcpy(result->ob_bytes, va.buf, va.len);
+         memcpy(result->ob_bytes + va.len, vb.buf, vb.len);
+@@ -328,11 +327,11 @@
+     }
+ 
+     mysize = Py_SIZE(self);
+-    size = mysize + vo.len;
+-    if (size < 0) {
++    if (mysize > PY_SSIZE_T_MAX - vo.len) {
+         PyBuffer_Release(&vo);
+         return PyErr_NoMemory();
+     }
++    size = mysize + vo.len;
+     if (size < self->ob_alloc) {
+         Py_SIZE(self) = size;
+         self->ob_bytes[Py_SIZE(self)] = '\0'; /* Trailing null byte */
+@@ -357,9 +356,9 @@
+     if (count < 0)
+         count = 0;
+     mysize = Py_SIZE(self);
++    if (count != 0 && mysize > PY_SSIZE_T_MAX / count)
++        return PyErr_NoMemory();
+     size = mysize * count;
+-    if (count != 0 && size / count != mysize)
+-        return PyErr_NoMemory();
+     result = (PyByteArrayObject *)PyByteArray_FromStringAndSize(NULL, size);
+     if (result != NULL && size != 0) {
+         if (mysize == 1)
+@@ -382,9 +381,9 @@
+     if (count < 0)
+         count = 0;
+     mysize = Py_SIZE(self);
++    if (count != 0 && mysize > PY_SSIZE_T_MAX / count)
++        return PyErr_NoMemory();
+     size = mysize * count;
+-    if (count != 0 && size / count != mysize)
+-        return PyErr_NoMemory();
+     if (size < self->ob_alloc) {
+         Py_SIZE(self) = size;
+         self->ob_bytes[Py_SIZE(self)] = '\0'; /* Trailing null byte */
+@@ -2323,7 +2322,17 @@
+         Py_DECREF(item);
+ 
+         if (len >= buf_size) {
+-            buf_size = len + (len >> 1) + 1;
++            Py_ssize_t addition;
++            if (len == PY_SSIZE_T_MAX) {
++                Py_DECREF(it);
++                Py_DECREF(bytearray_obj);
++                return PyErr_NoMemory();
++            }
++            addition = len >> 1;
++            if (addition > PY_SSIZE_T_MAX - len - 1)
++                buf_size = PY_SSIZE_T_MAX;
++            else
++                buf_size = len + addition + 1;
+             if (PyByteArray_Resize((PyObject *)bytearray_obj, buf_size) < 0) {
+                 Py_DECREF(it);
+                 Py_DECREF(bytearray_obj);
+diff -r d33e0cf91556 Objects/classobject.c
+--- a/Objects/classobject.c
++++ b/Objects/classobject.c
+@@ -2256,7 +2256,7 @@
+     im = free_list;
+     if (im != NULL) {
+         free_list = (PyMethodObject *)(im->im_self);
+-        PyObject_INIT(im, &PyMethod_Type);
++        (void)PyObject_INIT(im, &PyMethod_Type);
+         numfree--;
+     }
+     else {
+diff -r d33e0cf91556 Objects/complexobject.c
+--- a/Objects/complexobject.c
++++ b/Objects/complexobject.c
+@@ -239,7 +239,7 @@
+     op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
+     if (op == NULL)
+         return PyErr_NoMemory();
+-    PyObject_INIT(op, &PyComplex_Type);
++    (void)PyObject_INIT(op, &PyComplex_Type);
+     op->cval = cval;
+     return (PyObject *) op;
+ }
+diff -r d33e0cf91556 Objects/exceptions.c
+--- a/Objects/exceptions.c
++++ b/Objects/exceptions.c
+@@ -1640,7 +1640,7 @@
+         return PyUnicode_FromString("");
+ 
+     /* Get reason and encoding as strings, which they might not be if
+-       they've been modified after we were contructed. */
++       they've been modified after we were constructed. */
+     reason_str = PyObject_Str(uself->reason);
+     if (reason_str == NULL)
+         goto done;
+@@ -1729,7 +1729,7 @@
+         return PyUnicode_FromString("");
+ 
+     /* Get reason and encoding as strings, which they might not be if
+-       they've been modified after we were contructed. */
++       they've been modified after we were constructed. */
+     reason_str = PyObject_Str(uself->reason);
+     if (reason_str == NULL)
+         goto done;
+@@ -1830,7 +1830,7 @@
+         return PyUnicode_FromString("");
+ 
+     /* Get reason as a string, which it might not be if it's been
+-       modified after we were contructed. */
++       modified after we were constructed. */
+     reason_str = PyObject_Str(uself->reason);
+     if (reason_str == NULL)
+         goto done;
+diff -r d33e0cf91556 Objects/fileobject.c
+--- a/Objects/fileobject.c
++++ b/Objects/fileobject.c
+@@ -2394,7 +2394,8 @@
+ 
+ #ifdef MS_WINDOWS
+     if (PyArg_ParseTupleAndKeywords(args, kwds, "U|si:file",
+-                                    kwlist, &po, &mode, &bufsize)) {
++                                    kwlist, &po, &mode, &bufsize) &&
++        wcslen(PyUnicode_AS_UNICODE(po)) == (size_t)PyUnicode_GET_SIZE(po)) {
+         wideargument = 1;
+         if (fill_file_fields(foself, NULL, po, mode,
+                              fclose) == NULL)
+diff -r d33e0cf91556 Objects/floatobject.c
+--- a/Objects/floatobject.c
++++ b/Objects/floatobject.c
+@@ -149,7 +149,7 @@
+     /* Inline PyObject_New */
+     op = free_list;
+     free_list = (PyFloatObject *)Py_TYPE(op);
+-    PyObject_INIT(op, &PyFloat_Type);
++    (void)PyObject_INIT(op, &PyFloat_Type);
+     op->ob_fval = fval;
+     return (PyObject *) op;
+ }
+diff -r d33e0cf91556 Objects/intobject.c
+--- a/Objects/intobject.c
++++ b/Objects/intobject.c
+@@ -107,7 +107,7 @@
+     /* Inline PyObject_New */
+     v = free_list;
+     free_list = (PyIntObject *)Py_TYPE(v);
+-    PyObject_INIT(v, &PyInt_Type);
++    (void)PyObject_INIT(v, &PyInt_Type);
+     v->ob_ival = ival;
+     return (PyObject *) v;
+ }
+@@ -1466,7 +1466,7 @@
+         /* PyObject_New is inlined */
+         v = free_list;
+         free_list = (PyIntObject *)Py_TYPE(v);
+-        PyObject_INIT(v, &PyInt_Type);
++        (void)PyObject_INIT(v, &PyInt_Type);
+         v->ob_ival = ival;
+         small_ints[ival + NSMALLNEGINTS] = v;
+     }
+diff -r d33e0cf91556 Objects/longobject.c
+--- a/Objects/longobject.c
++++ b/Objects/longobject.c
+@@ -556,10 +556,10 @@
+         size_t i;
+         const unsigned char* p = pendbyte;
+         const int pincr = -incr;  /* search MSB to LSB */
+-        const unsigned char insignficant = is_signed ? 0xff : 0x00;
++        const unsigned char insignificant = is_signed ? 0xff : 0x00;
+ 
+         for (i = 0; i < n; ++i, p += pincr) {
+-            if (*p != insignficant)
++            if (*p != insignificant)
+                 break;
+         }
+         numsignificantbytes = n - i;
+@@ -3315,9 +3315,9 @@
+     /* Round by directly modifying the low digit of x. */
+     mask = (digit)1 << (extra_bits - 1);
+     low = x->ob_digit[0] | inexact;
+-    if (low & mask && low & (3*mask-1))
++    if ((low & mask) && (low & (3U*mask-1U)))
+         low += mask;
+-    x->ob_digit[0] = low & ~(mask-1U);
++    x->ob_digit[0] = low & ~(2U*mask-1U);
+ 
+     /* Convert x to a double dx; the conversion is exact. */
+     dx = x->ob_digit[--x_size];
+@@ -3715,6 +3715,11 @@
+         PyErr_SetString(PyExc_ValueError, "negative shift count");
+         goto lshift_error;
+     }
++
++    if (Py_SIZE(a) == 0) {
++        return PyLong_FromLong(0);
++    }
++
+     /* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */
+     wordshift = shiftby / PyLong_SHIFT;
+     remshift  = shiftby - wordshift * PyLong_SHIFT;
+diff -r d33e0cf91556 Objects/methodobject.c
+--- a/Objects/methodobject.c
++++ b/Objects/methodobject.c
+@@ -20,7 +20,7 @@
+     op = free_list;
+     if (op != NULL) {
+         free_list = (PyCFunctionObject *)(op->m_self);
+-        PyObject_INIT(op, &PyCFunction_Type);
++        (void)PyObject_INIT(op, &PyCFunction_Type);
+         numfree--;
+     }
+     else {
+diff -r d33e0cf91556 Objects/stringobject.c
+--- a/Objects/stringobject.c
++++ b/Objects/stringobject.c
+@@ -88,7 +88,7 @@
+     op = (PyStringObject *)PyObject_MALLOC(PyStringObject_SIZE + size);
+     if (op == NULL)
+         return PyErr_NoMemory();
+-    PyObject_INIT_VAR(op, &PyString_Type, size);
++    (void)PyObject_INIT_VAR(op, &PyString_Type, size);
+     op->ob_shash = -1;
+     op->ob_sstate = SSTATE_NOT_INTERNED;
+     if (str != NULL)
+@@ -143,7 +143,7 @@
+     op = (PyStringObject *)PyObject_MALLOC(PyStringObject_SIZE + size);
+     if (op == NULL)
+         return PyErr_NoMemory();
+-    PyObject_INIT_VAR(op, &PyString_Type, size);
++    (void)PyObject_INIT_VAR(op, &PyString_Type, size);
+     op->ob_shash = -1;
+     op->ob_sstate = SSTATE_NOT_INTERNED;
+     Py_MEMCPY(op->ob_sval, str, size+1);
+@@ -901,7 +901,7 @@
+     fputc(quote, fp);
+     for (i = 0; i < str_len; i++) {
+         /* Since strings are immutable and the caller should have a
+-        reference, accessing the interal buffer should not be an issue
++        reference, accessing the internal buffer should not be an issue
+         with the GIL released. */
+         c = op->ob_sval[i];
+         if (c == quote || c == '\\')
+@@ -1040,7 +1040,6 @@
+         Py_INCREF(a);
+         return (PyObject *)a;
+     }
+-    size = Py_SIZE(a) + Py_SIZE(b);
+     /* Check that string sizes are not negative, to prevent an
+        overflow in cases where we are passed incorrectly-created
+        strings with negative lengths (due to a bug in other code).
+@@ -1051,6 +1050,7 @@
+                         "strings are too large to concat");
+         return NULL;
+     }
++    size = Py_SIZE(a) + Py_SIZE(b);
+ 
+     /* Inline PyObject_NewVar */
+     if (size > PY_SSIZE_T_MAX - PyStringObject_SIZE) {
+@@ -1061,7 +1061,7 @@
+     op = (PyStringObject *)PyObject_MALLOC(PyStringObject_SIZE + size);
+     if (op == NULL)
+         return PyErr_NoMemory();
+-    PyObject_INIT_VAR(op, &PyString_Type, size);
++    (void)PyObject_INIT_VAR(op, &PyString_Type, size);
+     op->ob_shash = -1;
+     op->ob_sstate = SSTATE_NOT_INTERNED;
+     Py_MEMCPY(op->ob_sval, a->ob_sval, Py_SIZE(a));
+@@ -1081,15 +1081,15 @@
+     size_t nbytes;
+     if (n < 0)
+         n = 0;
+-    /* watch out for overflows:  the size can overflow int,
++    /* watch out for overflows:  the size can overflow Py_ssize_t,
+      * and the # of bytes needed can overflow size_t
+      */
+-    size = Py_SIZE(a) * n;
+-    if (n && size / n != Py_SIZE(a)) {
++    if (n && Py_SIZE(a) > PY_SSIZE_T_MAX / n) {
+         PyErr_SetString(PyExc_OverflowError,
+             "repeated string is too long");
+         return NULL;
+     }
++    size = Py_SIZE(a) * n;
+     if (size == Py_SIZE(a) && PyString_CheckExact(a)) {
+         Py_INCREF(a);
+         return (PyObject *)a;
+@@ -1103,7 +1103,7 @@
+     op = (PyStringObject *)PyObject_MALLOC(PyStringObject_SIZE + nbytes);
+     if (op == NULL)
+         return PyErr_NoMemory();
+-    PyObject_INIT_VAR(op, &PyString_Type, size);
++    (void)PyObject_INIT_VAR(op, &PyString_Type, size);
+     op->ob_shash = -1;
+     op->ob_sstate = SSTATE_NOT_INTERNED;
+     op->ob_sval[size] = '\0';
+diff -r d33e0cf91556 Objects/typeobject.c
+--- a/Objects/typeobject.c
++++ b/Objects/typeobject.c
+@@ -791,7 +791,7 @@
+         Py_INCREF(type);
+ 
+     if (type->tp_itemsize == 0)
+-        PyObject_INIT(obj, type);
++        (void)PyObject_INIT(obj, type);
+     else
+         (void) PyObject_INIT_VAR((PyVarObject *)obj, type, nitems);
+ 
+@@ -1274,8 +1274,10 @@
+ 
+     va_end(va);
+ 
+-    if (args == NULL)
++    if (args == NULL) {
++        Py_DECREF(func);
+         return NULL;
++    }
+ 
+     assert(PyTuple_Check(args));
+     retval = PyObject_Call(func, args, NULL);
+@@ -1312,8 +1314,10 @@
+ 
+     va_end(va);
+ 
+-    if (args == NULL)
++    if (args == NULL) {
++        Py_DECREF(func);
+         return NULL;
++    }
+ 
+     assert(PyTuple_Check(args));
+     retval = PyObject_Call(func, args, NULL);
+@@ -1379,7 +1383,7 @@
+ 
+     The next three properties are the 3 constraints in "C3".
+ 
+-    Local precendece order.
++    Local precedence order.
+     If A precedes B in C's MRO, then A will precede B in the MRO of all
+     subclasses of C.
+ 
+@@ -3693,8 +3697,10 @@
+         descr = PyDescr_NewMember(type, memb);
+         if (descr == NULL)
+             return -1;
+-        if (PyDict_SetItemString(dict, memb->name, descr) < 0)
++        if (PyDict_SetItemString(dict, memb->name, descr) < 0) {
++            Py_DECREF(descr);
+             return -1;
++        }
+         Py_DECREF(descr);
+     }
+     return 0;
+@@ -3713,8 +3719,10 @@
+ 
+         if (descr == NULL)
+             return -1;
+-        if (PyDict_SetItemString(dict, gsp->name, descr) < 0)
++        if (PyDict_SetItemString(dict, gsp->name, descr) < 0) {
++            Py_DECREF(descr);
+             return -1;
++        }
+         Py_DECREF(descr);
+     }
+     return 0;
+@@ -6498,8 +6506,10 @@
+             descr = PyDescr_NewWrapper(type, p, *ptr);
+             if (descr == NULL)
+                 return -1;
+-            if (PyDict_SetItem(dict, p->name_strobj, descr) < 0)
++            if (PyDict_SetItem(dict, p->name_strobj, descr) < 0) {
++                Py_DECREF(descr);
+                 return -1;
++            }
+             Py_DECREF(descr);
+         }
+     }
+diff -r d33e0cf91556 Objects/unicodeobject.c
+--- a/Objects/unicodeobject.c
++++ b/Objects/unicodeobject.c
+@@ -347,7 +347,7 @@
+             size_t new_size = sizeof(Py_UNICODE) * ((size_t)length + 1);
+             unicode->str = (Py_UNICODE*) PyObject_MALLOC(new_size);
+         }
+-        PyObject_INIT(unicode, &PyUnicode_Type);
++        (void)PyObject_INIT(unicode, &PyUnicode_Type);
+     }
+     else {
+         size_t new_size;
+@@ -6378,6 +6378,12 @@
+         return (PyObject *)v;
+     }
+ 
++    if (u->length > PY_SSIZE_T_MAX - v->length) {
++        PyErr_SetString(PyExc_OverflowError,
++                        "strings are too large to concat");
++        goto onError;
++    }
++
+     /* Concat the two Unicode strings */
+     w = _PyUnicode_New(u->length + v->length);
+     if (w == NULL)
+@@ -7223,17 +7229,17 @@
+         return (PyObject*) str;
+     }
+ 
+-    /* ensure # of chars needed doesn't overflow int and # of bytes
++    /* ensure # of chars needed doesn't overflow Py_ssize_t and # of bytes
+      * needed doesn't overflow size_t
+      */
+-    nchars = len * str->length;
+-    if (len && nchars / len != str->length) {
++    if (len && str->length > PY_SSIZE_T_MAX / len) {
+         PyErr_SetString(PyExc_OverflowError,
+                         "repeated string is too long");
+         return NULL;
+     }
+-    nbytes = (nchars + 1) * sizeof(Py_UNICODE);
+-    if (nbytes / sizeof(Py_UNICODE) != (size_t)(nchars + 1)) {
++    nchars = len * str->length;
++    nbytes = ((size_t)nchars + 1u) * sizeof(Py_UNICODE);
++    if (nbytes / sizeof(Py_UNICODE) != ((size_t)nchars + 1u)) {
+         PyErr_SetString(PyExc_OverflowError,
+                         "repeated string is too long");
+         return NULL;
+diff -r d33e0cf91556 PC/msvcrtmodule.c
+--- a/PC/msvcrtmodule.c
++++ b/PC/msvcrtmodule.c
+@@ -148,7 +148,7 @@
+     if (handle == -1)
+         return PyErr_SetFromErrno(PyExc_IOError);
+ 
+-    /* technically 'handle' is not a pointer, but a integer as
++    /* technically 'handle' is not a pointer, but an integer as
+        large as a pointer, Python's *VoidPtr interface is the
+        most appropriate here */
+     return PyLong_FromVoidPtr((void*)handle);
+diff -r d33e0cf91556 PC/os2emx/Makefile
+--- a/PC/os2emx/Makefile
++++ b/PC/os2emx/Makefile
+@@ -102,7 +102,7 @@
+   CFLAGS+=	-DPREFIX=$(DQUOTE)$(LIB_DIR)$(DQUOTE)
+ endif
+ 
+-# We're using the OMF format since EMX's ld has a obscure bug
++# We're using the OMF format since EMX's ld has an obscure bug
+ # because of which it sometimes fails to build relocations
+ # in .data segment that point to another .data locations
+ # (except for the final linking if the .EXEs)
+diff -r d33e0cf91556 Parser/asdl_c.py
+--- a/Parser/asdl_c.py
++++ b/Parser/asdl_c.py
+@@ -136,7 +136,7 @@
+ 
+ 
+ class StructVisitor(EmitVisitor):
+-    """Visitor to generate typdefs for AST."""
++    """Visitor to generate typedefs for AST."""
+ 
+     def visitModule(self, mod):
+         for dfn in mod.dfns:
+diff -r d33e0cf91556 Parser/pgen.c
+--- a/Parser/pgen.c
++++ b/Parser/pgen.c
+@@ -283,6 +283,7 @@
+ 
+     REQ(n, ATOM);
+     i = n->n_nchildren;
++    (void)i; /* Don't warn about set but unused */
+     REQN(i, 1);
+     n = n->n_child;
+     if (n->n_type == LPAR) {
+diff -r d33e0cf91556 Python/ast.c
+--- a/Python/ast.c
++++ b/Python/ast.c
+@@ -2179,7 +2179,7 @@
+        testlist: test (',' test)* [',']
+        augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^='
+                 | '<<=' | '>>=' | '**=' | '//='
+-       test: ... here starts the operator precendence dance
++       test: ... here starts the operator precedence dance
+      */
+ 
+     if (NCH(n) == 1) {
+diff -r d33e0cf91556 Python/compile.c
+--- a/Python/compile.c
++++ b/Python/compile.c
+@@ -1889,7 +1889,7 @@
+             attr = PyString_FromStringAndSize(src,
+                                 dot ? dot - src : strlen(src));
+             if (!attr)
+-                return -1;
++                return 0;
+             ADDOP_O(c, LOAD_ATTR, attr, names);
+             Py_DECREF(attr);
+             src = dot + 1;
+@@ -3147,7 +3147,7 @@
+ {
+     struct fblockinfo *f;
+     if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
+-        PyErr_SetString(PyExc_SystemError,
++        PyErr_SetString(PyExc_SyntaxError,
+                         "too many statically nested blocks");
+         return 0;
+     }
+diff -r d33e0cf91556 Python/getargs.c
+--- a/Python/getargs.c
++++ b/Python/getargs.c
+@@ -576,6 +576,17 @@
+         return 0;
+ }
+ 
++#ifdef Py_USING_UNICODE
++static size_t
++_ustrlen(Py_UNICODE *u)
++{
++    size_t i = 0;
++    Py_UNICODE *v = u;
++    while (*v != 0) { i++; v++; }
++    return i;
++}
++#endif
++
+ /* Convert a non-tuple argument.  Return NULL if conversion went OK,
+    or a string with a message describing the failure.  The message is
+    formatted as "must be , not ".
+@@ -1202,8 +1213,14 @@
+             format++;
+         } else {
+             Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
+-            if (PyUnicode_Check(arg))
++            if (PyUnicode_Check(arg)) {
+                 *p = PyUnicode_AS_UNICODE(arg);
++                if (_ustrlen(*p) != (size_t)PyUnicode_GET_SIZE(arg)) {
++                    return converterr(
++                        "unicode without null characters",
++                        arg, msgbuf, bufsize);
++                }
++            }
+             else
+                 return converterr("unicode", arg, msgbuf, bufsize);
+         }
+diff -r d33e0cf91556 Python/marshal.c
+--- a/Python/marshal.c
++++ b/Python/marshal.c
+@@ -16,8 +16,13 @@
+ /* High water mark to determine when the marshalled object is dangerously deep
+  * and risks coring the interpreter.  When the object stack gets this deep,
+  * raise an exception instead of continuing.
++ * On Windows debug builds, reduce this value.
+  */
++#if defined(MS_WINDOWS) && defined(_DEBUG)
++#define MAX_MARSHAL_STACK_DEPTH 1000
++#else
+ #define MAX_MARSHAL_STACK_DEPTH 2000
++#endif
+ 
+ #define TYPE_NULL               '0'
+ #define TYPE_NONE               'N'
+diff -r d33e0cf91556 Python/thread.c
+--- a/Python/thread.c
++++ b/Python/thread.c
+@@ -50,7 +50,7 @@
+    threads.
+ 
+    This is valid for HP-UX 11.23 running on an ia64 system. If needed, add
+-   a check of __ia64 to verify that we're running on a ia64 system instead
++   a check of __ia64 to verify that we're running on an ia64 system instead
+    of a pa-risc system.
+ */
+ #ifdef __hpux
+diff -r d33e0cf91556 Tools/freeze/freeze.py
+--- a/Tools/freeze/freeze.py
++++ b/Tools/freeze/freeze.py
+@@ -159,7 +159,7 @@
+     except getopt.error, msg:
+         usage('getopt error: ' + str(msg))
+ 
+-    # proces option arguments
++    # process option arguments
+     for o, a in opts:
+         if o == '-h':
+             print __doc__
+diff -r d33e0cf91556 Tools/i18n/pygettext.py
+--- a/Tools/i18n/pygettext.py
++++ b/Tools/i18n/pygettext.py
+@@ -482,7 +482,7 @@
+                             '# File: %(filename)s, line: %(lineno)d') % d
+                 elif options.locationstyle == options.GNU:
+                     # fit as many locations on one line, as long as the
+-                    # resulting line length doesn't exceeds 'options.width'
++                    # resulting line length doesn't exceed 'options.width'
+                     locline = '#:'
+                     for filename, lineno in v:
+                         d = {'filename': filename, 'lineno': lineno}
+diff -r d33e0cf91556 Tools/msi/WixCA.blob
+Binary file Tools/msi/WixCA.blob has changed
+diff -r d33e0cf91556 Tools/msi/msi.py
+--- a/Tools/msi/msi.py
++++ b/Tools/msi/msi.py
+@@ -376,6 +376,7 @@
+     # the installed/uninstalled state according to both the
+     # Extensions and TclTk features.
+     add_data(db, "Binary", [("Script", msilib.Binary("msisupport.dll"))])
++    add_data(db, "Binary", [("WixCA", msilib.Binary("WixCA.blob"))])
+     # See "Custom Action Type 1"
+     if msilib.Win64:
+         CheckDir = "CheckDir"
+@@ -407,10 +408,11 @@
+               ("VerdanaRed9", "Verdana", 9, 255, 0),
+              ])
+ 
+-    compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py3_" "[TARGETDIR]Lib"'
+-    lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"'
+-    updatepipargs = r'-m ensurepip -U --default-pip'
+-    removepipargs = r'-B -m ensurepip._uninstall'
++    compileargs = r'"[#python.exe]" -Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py3_" "[TARGETDIR]Lib"'
++    compileoargs = r'"[#python.exe]" -O -Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py3_" "[TARGETDIR]Lib"'
++    lib2to3args = r'"[#python.exe]" -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"'
++    updatepipargs = r'"[#python.exe]" -m ensurepip -U --default-pip'
++    removepipargs = r'"[#python.exe]" -B -m ensurepip._uninstall'
+     # See "CustomAction Table"
+     add_data(db, "CustomAction", [
+         # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty
+@@ -424,11 +426,16 @@
+         # See "Custom Action Type 18"
+         # msidbCustomActionTypeInScript (1024); run during actual installation
+         # msidbCustomActionTypeNoImpersonate (2048); run action in system account, not user account
+-        ("CompilePyc", 18+1024+2048, "python.exe", compileargs),
+-        ("CompilePyo", 18+1024+2048, "python.exe", "-O "+compileargs),
+-        ("CompileGrammar", 18+1024+2048, "python.exe", lib2to3args),
+-        ("UpdatePip", 18+1024+2048, "python.exe", updatepipargs),
+-        ("RemovePip", 18+1024+2048, "python.exe", removepipargs),
++        ("SetCompilePycCommandLine", 51, "CompilePyc", compileargs),
++        ("SetCompilePyoCommandLine", 51, "CompilePyo", compileoargs),
++        ("SetCompileGrammarCommandLine", 51, "CompileGrammar", lib2to3args),
++        ("CompilePyc", 1+64+1024, "WixCA", "CAQuietExec"),
++        ("CompilePyo", 1+64+1024, "WixCA", "CAQuietExec"),
++        ("CompileGrammar", 1+64+1024, "WixCA", "CAQuietExec"),
++        ("SetUpdatePipCommandLine", 51, "UpdatePip", updatepipargs),
++        ("UpdatePip", 1+64+1024, "WixCA", "CAQuietExec"),
++        ("SetRemovePipCommandLine", 51, "RemovePip", removepipargs),
++        ("RemovePip", 1+64+1024, "WixCA", "CAQuietExec"),
+         ])
+ 
+     # UI Sequences, see "InstallUISequence Table", "Using a Sequence Table"
+@@ -460,15 +467,20 @@
+              ("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
+              ("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
+              ("UpdateEditIDLE", None, 1050),
++             # remove pip when state changes to INSTALLSTATE_ABSENT
++             # run before RemoveFiles
++             ("SetRemovePipCommandLine", "&pip_feature=2 and !pip_feature=3", 3498),
++             ("RemovePip", "RemovePip", 3499),
+              # run command if install state of pip changes to INSTALLSTATE_LOCAL
+              # run after InstallFiles
+-             ("UpdatePip", "&pip_feature=3", 4001),
+-             # remove pip when state changes to INSTALLSTATE_ABSENT
+-             # run before RemoveFiles
+-             ("RemovePip", "&pip_feature=2", 3499),
+-             ("CompilePyc", "COMPILEALL", 4002),
+-             ("CompilePyo", "COMPILEALL", 4003),
+-             ("CompileGrammar", "COMPILEALL", 4004),
++             ("SetUpdatePipCommandLine", "&pip_feature=3 and not !pip_feature=3", 4001),
++             ("UpdatePip", "UpdatePip", 4002),
++             ("SetCompilePycCommandLine", "COMPILEALL", 4003),
++             ("SetCompilePyoCommandLine", "COMPILEALL", 4004),
++             ("SetCompileGrammarCommandLine", "COMPILEALL", 4005),
++             ("CompilePyc", "CompilePyc", 4006),
++             ("CompilePyo", "CompilePyo", 4007),
++             ("CompileGrammar", "CompileGrammar", 4008),
+             ])
+     add_data(db, "AdminExecuteSequence",
+             [("InitialTargetDir", 'TARGETDIR=""', 750),
+diff -r d33e0cf91556 Tools/msi/schema.py
+--- a/Tools/msi/schema.py
++++ b/Tools/msi/schema.py
+@@ -733,7 +733,7 @@
+ (u'CustomAction',u'Source',u'Y',None, None, None, None, u'CustomSource',None, u'The table reference of the source of the code.',),
+ (u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Execution parameter, depends on the type of custom action',),
+ (u'DrLocator',u'Signature_',u'N',None, None, None, None, u'Identifier',None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.',),
+-(u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',),
++(u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',),
+ (u'DrLocator',u'Depth',u'Y',0,32767,None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.',),
+ (u'DrLocator',u'Parent',u'Y',None, None, None, None, u'Identifier',None, u'The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.',),
+ (u'DuplicateFile',u'File_',u'N',None, None, u'File',1,u'Identifier',None, u'Foreign key referencing the source file to be duplicated.',),
+diff -r d33e0cf91556 Tools/msi/uisample.py
+--- a/Tools/msi/uisample.py
++++ b/Tools/msi/uisample.py
+@@ -998,7 +998,7 @@
+ (u'CustomAction', u'Source', u'Y', None, None, None, None, u'CustomSource', None, u'The table reference of the source of the code.'),
+ (u'CustomAction', u'Target', u'Y', None, None, None, None, u'Formatted', None, u'Execution parameter, depends on the type of custom action'),
+ (u'DrLocator', u'Signature_', u'N', None, None, None, None, u'Identifier', None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.'),
+-(u'DrLocator', u'Path', u'Y', None, None, None, None, u'AnyPath', None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.'),
++(u'DrLocator', u'Path', u'Y', None, None, None, None, u'AnyPath', None, u'The path on the user system. This is either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.'),
+ (u'DrLocator', u'Depth', u'Y', 0, 32767, None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.'),
+ (u'DrLocator', u'Parent', u'Y', None, None, None, None, u'Identifier', None, u'The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.'),
+ (u'DuplicateFile', u'File_', u'N', None, None, u'File', 1, u'Identifier', None, u'Foreign key referencing the source file to be duplicated.'),
+diff -r d33e0cf91556 Tools/nuget/build.bat
+--- /dev/null
++++ b/Tools/nuget/build.bat
+@@ -0,0 +1,63 @@
++@echo off
++setlocal
++set D=%~dp0
++set PCBUILD=%D%..\..\PCBuild\
++
++set BUILDX86=
++set BUILDX64=
++set REBUILD=
++set OUTPUT=
++set PACKAGES=
++
++:CheckOpts
++if "%~1" EQU "-h" goto Help
++if "%~1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
++if "%~1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts
++if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts
++if "%~1" EQU "-o" (set OUTPUT="/p:OutputPath=%~2") && shift && shift && goto CheckOpts
++if "%~1" EQU "--out" (set OUTPUT="/p:OutputPath=%~2") && shift && shift && goto CheckOpts
++if "%~1" EQU "-p" (set PACKAGES=%PACKAGES% %~2) && shift && shift && goto CheckOpts
++
++if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
++
++if not defined NUGET where nuget -q || echo Cannot find nuget.exe on PATH and NUGET is not set. && exit /B 1
++if not defined PYTHON set PYTHON=py -3
++
++@%PYTHON% -c "" >nul 2>nul
++@if errorlevel 1 (
++    %NUGET% install python -OutputDirectory "%D%obj" -ExcludeVersion -NonInteractive
++    set PYTHON="%D%obj\python\tools\python.exe"
++)
++
++call "%PCBUILD%env.bat" x86
++
++if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%"
++
++if defined BUILDX86 (
++    if defined REBUILD ( call "%PCBUILD%build.bat" -e -r
++    ) else if not exist "%PCBUILD%python.exe" call "%PCBUILD%build.bat" -e
++    if errorlevel 1 goto :eof
++
++    msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES%
++    if errorlevel 1 goto :eof
++)
++
++if defined BUILDX64 (
++    if defined REBUILD ( call "%PCBUILD%build.bat" -p x64 -e -r
++    ) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e
++    if errorlevel 1 goto :eof
++
++    msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES%
++    if errorlevel 1 goto :eof
++)
++
++exit /B 0
++
++:Help
++echo build.bat [-x86] [-x64] [--out DIR] [-r] [-h]
++echo.
++echo    -x86                Build x86 installers
++echo    -x64                Build x64 installers
++echo    -r                  Rebuild rather than incremental build
++echo    --out [DIR]         Override output directory
++echo    -h                  Show usage
+diff -r d33e0cf91556 Tools/nuget/make_pkg.proj
+--- /dev/null
++++ b/Tools/nuget/make_pkg.proj
+@@ -0,0 +1,53 @@
++
++
++    
++        {6BA7092C-0093-47F0-9ED2-282AEE981E14}
++        python2
++        $(OutputName)x86
++        $(MSBuildThisFileDirectory)
++        
++        false
++        true
++    
++
++    
++
++    
++        $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)
++        false
++        $(OutputName).$(NuspecVersion)
++        .nupkg
++        $(OutputPath)\$(TargetName)$(TargetExt)
++        $(MSBuildThisFileDirectory)\obj_$(ArchName)
++        
++        rmdir /q/s "$(IntermediateOutputPath)"
++        
++        py
++        "$(Python)" "$(MSBuildThisFileDirectory)\make_zip.py"
++        $(PythonArguments) -s "$(PySourcePath.Trim('\'))" -t "$(IntermediateOutputPath)" -a $(ArchName)
++        
++        "$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"
++        "$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)
++        
++        "$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec"
++        $(NugetArguments) -BasePath "$(IntermediateOutputPath)"
++        $(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"
++        $(NugetArguments) -Version "$(NuspecVersion)"
++        $(NugetArguments) -NoPackageAnalysis -NonInteractive
++    
++
++    
++        
++    
++
++    
++        
++        
++        
++        
++        
++    
++
++    
++    
++
+diff -r d33e0cf91556 Tools/nuget/make_zip.py
+--- /dev/null
++++ b/Tools/nuget/make_zip.py
+@@ -0,0 +1,219 @@
++#! /usr/bin/python3
++
++import argparse
++import py_compile
++import re
++import sys
++import shutil
++import stat
++import os
++import tempfile
++
++from pathlib import Path
++from zipfile import ZipFile, ZIP_DEFLATED
++import subprocess
++
++TKTCL_RE = re.compile(r'^(_?tk|tcl).+\.(pyd|dll)', re.IGNORECASE)
++DEBUG_RE = re.compile(r'_d\.(pyd|dll|exe|pdb|lib)$', re.IGNORECASE)
++PYTHON_DLL_RE = re.compile(r'python\d\d?\.dll$', re.IGNORECASE)
++
++DEBUG_FILES = {
++    '_ctypes_test',
++    '_testbuffer',
++    '_testcapi',
++    '_testimportmultiple',
++    '_testmultiphase',
++    'xxlimited',
++    'python3_dstub',
++}
++
++EXCLUDE_FROM_LIBRARY = {
++    '__pycache__',
++    'ensurepip',
++    'idlelib',
++    'pydoc_data',
++    'site-packages',
++    'tkinter',
++    'turtledemo',
++    'venv',
++}
++
++EXCLUDE_FILE_FROM_LIBRARY = {
++    'bdist_wininst.py',
++}
++
++EXCLUDE_FILE_FROM_LIBS = {
++    'ssleay',
++    'libeay',
++    'python3stub',
++}
++
++def is_not_debug(p):
++    if DEBUG_RE.search(p.name):
++        return False
++
++    if TKTCL_RE.search(p.name):
++        return False
++
++    return p.stem.lower() not in DEBUG_FILES
++
++def is_not_debug_or_python(p):
++    return is_not_debug(p) and not PYTHON_DLL_RE.search(p.name)
++
++def include_in_lib(p):
++    name = p.name.lower()
++    if p.is_dir():
++        if name in EXCLUDE_FROM_LIBRARY:
++            return False
++        if name.startswith('plat-'):
++            return False
++        if name == 'test' and p.parts[-2].lower() == 'lib':
++            return False
++        if name in {'test', 'tests'} and p.parts[-3].lower() == 'lib':
++            return False
++        return True
++
++    if name in EXCLUDE_FILE_FROM_LIBRARY:
++        return False
++
++    suffix = p.suffix.lower()
++    return suffix not in {'.pyc', '.pyo', '.exe'}
++
++def include_in_libs(p):
++    if not is_not_debug(p):
++        return False
++
++    return p.stem.lower() not in EXCLUDE_FILE_FROM_LIBS
++
++def include_in_tools(p):
++    if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}:
++        return True
++
++    return p.suffix.lower() in {'.py', '.pyw', '.txt'}
++
++FULL_LAYOUT = [
++    ('/', 'PCBuild/$arch', 'python.exe', is_not_debug),
++    ('/', 'PCBuild/$arch', 'pythonw.exe', is_not_debug),
++    ('/', 'PCBuild/$arch', 'python27.dll', None),
++    ('DLLs/', 'PCBuild/$arch', '*.pyd', is_not_debug),
++    ('DLLs/', 'PCBuild/$arch', '*.dll', is_not_debug_or_python),
++    ('include/', 'include', '*.h', None),
++    ('include/', 'PC', 'pyconfig.h', None),
++    ('Lib/', 'Lib', '**/*', include_in_lib),
++    ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs),
++    ('Tools/', 'Tools', '**/*', include_in_tools),
++]
++
++EMBED_LAYOUT = [
++    ('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),
++    ('/', 'PCBuild/$arch', '*.pyd', is_not_debug),
++    ('/', 'PCBuild/$arch', '*.dll', is_not_debug),
++    ('python{0.major}{0.minor}.zip'.format(sys.version_info), 'Lib', '**/*', include_in_lib),
++]
++
++if os.getenv('DOC_FILENAME'):
++    FULL_LAYOUT.append(('Doc/', 'Doc/build/htmlhelp', os.getenv('DOC_FILENAME'), None))
++if os.getenv('VCREDIST_PATH'):
++    FULL_LAYOUT.append(('/', os.getenv('VCREDIST_PATH'), 'vcruntime*.dll', None))
++    EMBED_LAYOUT.append(('/', os.getenv('VCREDIST_PATH'), 'vcruntime*.dll', None))
++
++def copy_to_layout(target, rel_sources):
++    count = 0
++
++    if target.suffix.lower() == '.zip':
++        if target.exists():
++            target.unlink()
++
++        with ZipFile(str(target), 'w', ZIP_DEFLATED) as f:
++            with tempfile.TemporaryDirectory() as tmpdir:
++                for s, rel in rel_sources:
++                    if rel.suffix.lower() == '.py':
++                        pyc = Path(tmpdir) / rel.with_suffix('.pyc').name
++                        try:
++                            py_compile.compile(str(s), str(pyc), str(rel), doraise=True, optimize=2)
++                        except py_compile.PyCompileError:
++                            f.write(str(s), str(rel))
++                        else:
++                            f.write(str(pyc), str(rel.with_suffix('.pyc')))
++                    else:
++                        f.write(str(s), str(rel))
++                    count += 1
++
++    else:
++        for s, rel in rel_sources:
++            dest = target / rel
++            try:
++                dest.parent.mkdir(parents=True)
++            except FileExistsError:
++                pass
++            if dest.is_file():
++                dest.chmod(stat.S_IWRITE)
++            shutil.copy(str(s), str(dest))
++            if dest.is_file():
++                dest.chmod(stat.S_IWRITE)
++            count += 1
++
++    return count
++
++def rglob(root, pattern, condition):
++    dirs = [root]
++    recurse = pattern[:3] in {'**/', '**\\'}
++    while dirs:
++        d = dirs.pop(0)
++        for f in d.glob(pattern[3:] if recurse else pattern):
++            if recurse and f.is_dir() and (not condition or condition(f)):
++                dirs.append(f)
++            elif f.is_file() and (not condition or condition(f)):
++                yield f, f.relative_to(root)
++
++def main():
++    parser = argparse.ArgumentParser()
++    parser.add_argument('-s', '--source', metavar='dir', help='The directory containing the repository root', type=Path)
++    parser.add_argument('-o', '--out', metavar='file', help='The name of the output self-extracting archive', type=Path, default=None)
++    parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None)
++    parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False)
++    parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32")
++    ns = parser.parse_args()
++
++    source = ns.source or (Path(__file__).resolve().parent.parent.parent)
++    out = ns.out
++    arch = '' if ns.arch == 'win32' else ns.arch
++    assert isinstance(source, Path)
++    assert not out or isinstance(out, Path)
++    assert isinstance(arch, str)
++
++    if ns.temp:
++        temp = ns.temp
++        delete_temp = False
++    else:
++        temp = Path(tempfile.mkdtemp())
++        delete_temp = True
++
++    if out:
++        try:
++            out.parent.mkdir(parents=True)
++        except FileExistsError:
++            pass
++    try:
++        temp.mkdir(parents=True)
++    except FileExistsError:
++        pass
++
++    layout = EMBED_LAYOUT if ns.embed else FULL_LAYOUT
++
++    try:
++        for t, s, p, c in layout:
++            s = source / s.replace("$arch", arch)
++            copied = copy_to_layout(temp / t.rstrip('/'), rglob(s, p, c))
++            print('Copied {} files'.format(copied))
++
++        if out:
++            total = copy_to_layout(out, rglob(temp, '**/*', None))
++            print('Wrote {} files to {}'.format(total, out))
++    finally:
++        if delete_temp:
++            shutil.rmtree(temp, True)
++
++
++if __name__ == "__main__":
++    sys.exit(int(main() or 0))
+diff -r d33e0cf91556 Tools/nuget/python2.nuspec
+--- /dev/null
++++ b/Tools/nuget/python2.nuspec
+@@ -0,0 +1,18 @@
++
++
++  
++    python2
++    Python 2.7
++    0.0.0.0
++    Python Software Foundation
++    https://docs.python.org/2.7/license.html
++    https://www.python.org/
++    false
++    Installs 64-bit Python 2.7 for use in build scenarios.
++    https://www.python.org/static/favicon.ico
++    python
++  
++  
++    
++  
++
+diff -r d33e0cf91556 Tools/nuget/python2x86.nuspec
+--- /dev/null
++++ b/Tools/nuget/python2x86.nuspec
+@@ -0,0 +1,18 @@
++
++
++  
++    python2x86
++    Python 2.7 (32-bit)
++    Python Software Foundation
++    0.0.0.0
++    https://docs.python.org/2.7/license.html
++    https://www.python.org/
++    false
++    Installs 32-bit Python 2.7 for use in build scenarios.
++    https://www.python.org/static/favicon.ico
++    python
++  
++  
++    
++  
++
+diff -r d33e0cf91556 Tools/scripts/redemo.py
+--- a/Tools/scripts/redemo.py
++++ b/Tools/scripts/redemo.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-"""Basic regular expression demostration facility (Perl style syntax)."""
++"""Basic regular expression demonstration facility (Perl style syntax)."""
+ 
+ from Tkinter import *
+ import re
+diff -r d33e0cf91556 configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,11 +8,10 @@
+ AC_PREREQ(2.65)
+ 
+ AC_REVISION($Revision$)
+-AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
++AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/)
+ AC_CONFIG_SRCDIR([Include/object.h])
+ AC_CONFIG_HEADER(pyconfig.h)
+ 
+-AC_SUBST(cross_compiling)
+ AC_CANONICAL_HOST
+ AC_SUBST(build)
+ AC_SUBST(host)
+@@ -36,12 +35,16 @@
+         AC_MSG_RESULT($interp)
+ 	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
+     fi
++    # Used to comment out stuff for rebuilding generated files
++    GENERATED_COMMENT='#'
+ elif test "$cross_compiling" = maybe; then
+     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
+ else
+     PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E'
++    GENERATED_COMMENT=''
+ fi
+ AC_SUBST(PYTHON_FOR_BUILD)
++AC_SUBST(GENERATED_COMMENT)
+ 
+ dnl Ensure that if prefix is specified, it does not end in a slash. If
+ dnl it does, we get path names containing '//' which is both ugly and
+@@ -2333,9 +2336,6 @@
+ # checks for libraries
+ AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+ AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+-AC_CHECK_LIB(crypto, RAND_egd,
+-             AC_DEFINE(HAVE_RAND_EGD, 1,
+-             [Define if the libcrypto has RAND_egd]))
+ 
+ # only check for sem_init if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
+diff -r d33e0cf91556 pyconfig.h.in
+--- a/pyconfig.h.in
++++ b/pyconfig.h.in
+@@ -550,9 +550,6 @@
+ /* Define to 1 if you have the `putenv' function. */
+ #undef HAVE_PUTENV
+ 
+-/* Define if the libcrypto has RAND_egd */
+-#undef HAVE_RAND_EGD
+-
+ /* Define to 1 if you have the `readlink' function. */
+ #undef HAVE_READLINK
+ 
+diff -r d33e0cf91556 setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -1652,7 +1652,7 @@
+             if int(os.uname()[2].split('.')[0]) >= 8:
+                 # We're on Mac OS X 10.4 or later, the compiler should
+                 # support '-Wno-deprecated-declarations'. This will
+-                # surpress deprecation warnings for the Carbon extensions,
++                # suppress deprecation warnings for the Carbon extensions,
+                 # these extensions wrap the Carbon APIs and even those
+                 # parts that are deprecated.
+                 carbon_extra_compile_args = ['-Wno-deprecated-declarations']
--- python2.7-2.7.12.orig/debian/patches/hotshot-import.diff
+++ python2.7-2.7.12/debian/patches/hotshot-import.diff
@@ -0,0 +1,19 @@
+# DP: hotshot: Check for the availability of the profile and pstats modules.
+
+Index: b/Lib/hotshot/stats.py
+===================================================================
+--- a/Lib/hotshot/stats.py
++++ b/Lib/hotshot/stats.py
+@@ -1,7 +1,10 @@
+ """Statistics analyzer for HotShot."""
+ 
+-import profile
+-import pstats
++try:
++    import profile
++    import pstats
++except ImportError, e:
++    raise ImportError, str(e) + '; please install the python-profiler package'
+ 
+ import hotshot.log
+ 
--- python2.7-2.7.12.orig/debian/patches/hurd-disable-nonworking-constants.diff
+++ python2.7-2.7.12/debian/patches/hurd-disable-nonworking-constants.diff
@@ -0,0 +1,38 @@
+# DP: Comment out constant exposed on the API which are not implemented on
+# DP: GNU/Hurd. They would not work at runtime anyway.
+
+Index: b/Modules/posixmodule.c
+===================================================================
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -9303,12 +9303,14 @@ all_ins(PyObject *d)
+ #ifdef O_LARGEFILE
+     if (ins(d, "O_LARGEFILE", (long)O_LARGEFILE)) return -1;
+ #endif
++#ifndef __GNU__
+ #ifdef O_SHLOCK
+     if (ins(d, "O_SHLOCK", (long)O_SHLOCK)) return -1;
+ #endif
+ #ifdef O_EXLOCK
+     if (ins(d, "O_EXLOCK", (long)O_EXLOCK)) return -1;
+ #endif
++#endif
+ 
+ /* MS Windows */
+ #ifdef O_NOINHERIT
+Index: b/Modules/socketmodule.c
+===================================================================
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -4930,9 +4930,11 @@ init_socket(void)
+ #ifdef  SO_OOBINLINE
+     PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
+ #endif
++#ifndef __GNU__
+ #ifdef  SO_REUSEPORT
+     PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
+ #endif
++#endif
+ #ifdef  SO_SNDBUF
+     PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
+ #endif
--- python2.7-2.7.12.orig/debian/patches/idle-tk8.6.diff
+++ python2.7-2.7.12/debian/patches/idle-tk8.6.diff
@@ -0,0 +1,17 @@
+Index: b/Lib/idlelib/configDialog.py
+===================================================================
+--- a/Lib/idlelib/configDialog.py
++++ b/Lib/idlelib/configDialog.py
+@@ -111,7 +111,11 @@ class ConfigDialog(Toplevel):
+ 
+     def CreatePageFontTab(self):
+         parent = self.parent
+-        self.fontSize = StringVar(parent)
++        # see issue #26673
++        if TkVersion >= 8.6:
++            self.fontSize = IntVar(parent)
++        else:
++            self.fontSize = StringVar(parent)
+         self.fontBold = BooleanVar(parent)
+         self.fontName = StringVar(parent)
+         self.spaceNum = IntVar(parent)
--- python2.7-2.7.12.orig/debian/patches/installed-testsuite.diff
+++ python2.7-2.7.12/debian/patches/installed-testsuite.diff
@@ -0,0 +1,37 @@
+# DP: Changes needed to run the installed testsuite.
+# DP: Also removed:
+# DP:   - ctypes/test/test_macholib.py
+# DP:   - distutils/tests/test_bdist_wininst.py
+
+Index: b/Lib/distutils/tests/test_build_ext.py
+===================================================================
+--- a/Lib/distutils/tests/test_build_ext.py
++++ b/Lib/distutils/tests/test_build_ext.py
+@@ -83,27 +83,6 @@ class BuildExtTestCase(support.TempdirMa
+         self.assertIsInstance(xx.Null(), xx.Null)
+         self.assertIsInstance(xx.Str(), xx.Str)
+ 
+-    def test_solaris_enable_shared(self):
+-        dist = Distribution({'name': 'xx'})
+-        cmd = build_ext(dist)
+-        old = sys.platform
+-
+-        sys.platform = 'sunos' # fooling finalize_options
+-        from distutils.sysconfig import  _config_vars
+-        old_var = _config_vars.get('Py_ENABLE_SHARED')
+-        _config_vars['Py_ENABLE_SHARED'] = 1
+-        try:
+-            cmd.ensure_finalized()
+-        finally:
+-            sys.platform = old
+-            if old_var is None:
+-                del _config_vars['Py_ENABLE_SHARED']
+-            else:
+-                _config_vars['Py_ENABLE_SHARED'] = old_var
+-
+-        # make sure we get some library dirs under solaris
+-        self.assertGreater(len(cmd.library_dirs), 0)
+-
+     @unittest.skipIf(sys.version < '2.6',
+                      'site.USER_SITE was introduced in 2.6')
+     def test_user_site(self):
--- python2.7-2.7.12.orig/debian/patches/issue27239.diff
+++ python2.7-2.7.12/debian/patches/issue27239.diff
@@ -0,0 +1,13 @@
+Index: b/Lib/idlelib/macosxSupport.py
+===================================================================
+--- a/Lib/idlelib/macosxSupport.py
++++ b/Lib/idlelib/macosxSupport.py
+@@ -18,7 +18,7 @@ def isCarbonAquaTk(root):
+                         DeprecationWarning, stacklevel=2)
+     return isCarbonTk()
+ 
+-_tk_type = None
++_tk_type = "other"
+ 
+ def _initializeTkVariantTests(root):
+     """
--- python2.7-2.7.12.orig/debian/patches/issue670664.diff
+++ python2.7-2.7.12/debian/patches/issue670664.diff
@@ -0,0 +1,54 @@
+# DP: Proposed patch for issue #670664.
+
+--- a/Lib/HTMLParser.py
++++ b/Lib/HTMLParser.py
+@@ -96,6 +96,7 @@
+         self.rawdata = ''
+         self.lasttag = '???'
+         self.interesting = interesting_normal
++        self.cdata_tag = None
+         markupbase.ParserBase.reset(self)
+ 
+     def feed(self, data):
+@@ -120,11 +121,13 @@
+         """Return full source of start tag: '<...>'."""
+         return self.__starttag_text
+ 
+-    def set_cdata_mode(self):
++    def set_cdata_mode(self, tag):
+         self.interesting = interesting_cdata
++        self.cdata_tag = tag.lower()
+ 
+     def clear_cdata_mode(self):
+         self.interesting = interesting_normal
++        self.cdata_tag = None
+ 
+     # Internal -- handle data as far as reasonable.  May leave state
+     # and data to be processed by a subsequent call.  If 'end' is
+@@ -270,7 +273,7 @@
+         else:
+             self.handle_starttag(tag, attrs)
+             if tag in self.CDATA_CONTENT_ELEMENTS:
+-                self.set_cdata_mode()
++                self.set_cdata_mode(tag)
+         return endpos
+ 
+     # Internal -- check to see if we have a complete starttag; return end
+@@ -314,10 +317,16 @@
+         j = match.end()
+         match = endtagfind.match(rawdata, i) # 
+         if not match:
++            if self.cdata_tag is not None: return j
+             self.error("bad end tag: %r" % (rawdata[i:j],))
+-        tag = match.group(1)
++        tag = match.group(1).strip()
++	
++        if self.cdata_tag is not None:
++            if tag.lower() != self.cdata_tag: return j
++
+         self.handle_endtag(tag.lower())
+         self.clear_cdata_mode()
++
+         return j
+ 
+     # Overridable -- finish processing of start+end tag: 
--- python2.7-2.7.12.orig/debian/patches/issue9012a.diff
+++ python2.7-2.7.12/debian/patches/issue9012a.diff
@@ -0,0 +1,13 @@
+# DP: Link _math.o only once to the static library.
+
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -169,7 +169,7 @@
+ # Modules that should always be present (non UNIX dependent):
+ 
+ #array arraymodule.c	# array objects
+-#cmath cmathmodule.c _math.c # -lm # complex math library functions
++#cmath cmathmodule.c # -lm # complex math library functions
+ #math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
+ #_struct _struct.c	# binary structure packing/unpacking
+ #time timemodule.c # -lm # time operations and variables
--- python2.7-2.7.12.orig/debian/patches/issue9189.diff
+++ python2.7-2.7.12/debian/patches/issue9189.diff
@@ -0,0 +1,351 @@
+Index: b/Lib/sysconfig.py
+===================================================================
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -231,11 +231,19 @@ def _parse_makefile(filename, vars=None)
+                     done[n] = v
+ 
+     # do variable interpolation here
+-    while notdone:
+-        for name in notdone.keys():
++    variables = list(notdone.keys())
++
++    # Variables with a 'PY_' prefix in the makefile. These need to
++    # be made available without that prefix through sysconfig.
++    # Special care is needed to ensure that variable expansion works, even
++    # if the expansion uses the name without a prefix.
++    renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS')
++
++    while len(variables) > 0:
++        for name in tuple(variables):
+             value = notdone[name]
+             m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+-            if m:
++            if m is not None:
+                 n = m.group(1)
+                 found = True
+                 if n in done:
+@@ -246,23 +254,48 @@ def _parse_makefile(filename, vars=None)
+                 elif n in os.environ:
+                     # do it like make: fall back to environment
+                     item = os.environ[n]
++
++                elif n in renamed_variables:
++                    if name.startswith('PY_') and name[3:] in renamed_variables:
++                        item = ""
++
++                    elif 'PY_' + n in notdone:
++                        found = False
++
++                    else:
++                        item = str(done['PY_' + n])
++
+                 else:
+                     done[n] = item = ""
++
+                 if found:
+                     after = value[m.end():]
+                     value = value[:m.start()] + item + after
+                     if "$" in after:
+                         notdone[name] = value
+                     else:
+-                        try: value = int(value)
++                        try:
++                            value = int(value)
+                         except ValueError:
+                             done[name] = value.strip()
+                         else:
+                             done[name] = value
+-                        del notdone[name]
++                        variables.remove(name)
++
++                        if name.startswith('PY_') \
++                        and name[3:] in renamed_variables:
++
++                            name = name[3:]
++                            if name not in done:
++                                done[name] = value
++
++
+             else:
+-                # bogus variable reference; just drop it since we can't deal
+-                del notdone[name]
++                # bogus variable reference (e.g. "prefix=$/opt/python");
++                # just drop it since we can't deal
++                done[name] = value
++                variables.remove(name)
++
+     # strip spurious spaces
+     for k, v in done.items():
+         if isinstance(v, str):
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -73,12 +73,18 @@ MAKESETUP=      $(srcdir)/Modules/makese
+ # Compiler options
+ OPT=		@OPT@
+ BASECFLAGS=	@BASECFLAGS@
+-CFLAGS=		$(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS)
++CONFIGURE_CFLAGS=	@CFLAGS@
++CONFIGURE_CPPFLAGS=	@CPPFLAGS@
++CONFIGURE_LDFLAGS=	@LDFLAGS@
++# Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
++# command line to append to these values without stomping the pre-set
++# values.
++PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+-CPPFLAGS=	-I. -IInclude -I$(srcdir)/Include @CPPFLAGS@
+-LDFLAGS=	@LDFLAGS@
++PY_CPPFLAGS=	-I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
++PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
+ LDLAST=		@LDLAST@
+ SGI_ABI=	@SGI_ABI@
+ CCSHARED=	@CCSHARED@
+@@ -87,7 +93,7 @@ ARFLAGS=	@ARFLAGS@
+ # Extra C flags added for building the interpreter object files.
+ CFLAGSFORSHARED=@CFLAGSFORSHARED@
+ # C flags used for building the interpreter object files
+-PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
++PY_CORE_CFLAGS=	$(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+ 
+ 
+ # Machine-dependent subdirectories
+@@ -508,7 +514,7 @@ coverage-report:
+ 
+ # Build the interpreter
+ $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
+-		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
++		$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+ 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+@@ -533,7 +539,7 @@ pybuilddir.txt: $(BUILDPYTHON)
+ 
+ # This is shared by the math and cmath modules
+ Modules/_math.o: Modules/_math.c Modules/_math.h
+-	$(CC) -c $(CCSHARED) $(PY_CFLAGS) -o $@ $<
++	$(CC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $<
+ 
+ # Build the shared modules
+ # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
+@@ -544,7 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
+ 	    *\ -s*|s*) quiet="-q";; \
+ 	    *) quiet="";; \
+ 	esac; \
+-	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
++	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(PY_LDFLAGS)' OPT='$(OPT)' \
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ 
+@@ -562,18 +568,18 @@ $(LIBRARY): $(LIBRARY_OBJS)
+ 
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+-		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++		$(BLDSHARED) $(PY_LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 		$(LN) -f $(INSTSONAME) $@; \
+ 	else \
+-		$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++		$(BLDSHARED) $(PY_LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 	fi
+ 
+ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+-	 $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
++	 $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 
+ 
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
+-	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
++	$(LDSHARED) $(PY_LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
+ 
+ # Copy up the gdb python hooks into a position where they can be automatically
+ # loaded by gdb during Lib/test/test_gdb.py
+@@ -612,7 +618,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION
+ # for a shared core library; otherwise, this rule is a noop.
+ $(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
+ 	if test -n "$(DLLLIBRARY)"; then \
+-		$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
++		$(LDSHARED) $(PY_LDFLAGS) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
+ 			$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
+ 	else true; \
+ 	fi
+@@ -656,7 +662,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+ 		$(SIGNAL_OBJS) \
+ 		$(MODOBJS) \
+ 		$(srcdir)/Modules/getbuildinfo.c
+-	$(CC) -c $(PY_CFLAGS) \
++	$(CC) -c $(PY_CORE_CFLAGS) \
+ 	      -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \
+ 	      -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
+ 	      -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
+@@ -664,7 +670,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+ 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
+ 
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
+-	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
++	$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
+ 		-DPREFIX='"$(prefix)"' \
+ 		-DEXEC_PREFIX='"$(exec_prefix)"' \
+ 		-DVERSION='"$(VERSION)"' \
+@@ -672,7 +678,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
+ 		-o $@ $(srcdir)/Modules/getpath.c
+ 
+ Modules/python.o: $(srcdir)/Modules/python.c
+-	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
++	$(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+ 
+ Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h
+ 
+@@ -698,7 +704,7 @@ $(GRAMMAR_C): $(GRAMMAR_H)
+ 	fi
+ 
+ $(PGEN):	$(PGENOBJS)
+-		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
++		$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+ 
+ Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
+ 				$(srcdir)/Include/token.h \
+@@ -720,10 +726,10 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
+ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
+ 
+ Python/getplatform.o: $(srcdir)/Python/getplatform.c
+-		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
++		$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+ 
+ Python/importdl.o: $(srcdir)/Python/importdl.c
+-		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
++		$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+ 
+ Objects/unicodectype.o:	$(srcdir)/Objects/unicodectype.c \
+ 				$(srcdir)/Objects/unicodetype_db.h
+@@ -1357,7 +1363,7 @@ config.status:	$(srcdir)/configure
+ 
+ # Some make's put the object file in the current directory
+ .c.o:
+-	$(CC) -c $(PY_CFLAGS) -o $@ $<
++	$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
+ 
+ # Run reindent on the library
+ reindent:
+Index: b/Modules/makesetup
+===================================================================
+--- a/Modules/makesetup
++++ b/Modules/makesetup
+@@ -219,7 +219,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			case $doconfig in
+ 			no)	cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
+ 			*)
+-				cc="$cc \$(PY_CFLAGS)";;
++				cc="$cc \$(PY_CORE_CFLAGS)";;
+ 			esac
+ 			rule="$obj: $src; $cc $cpps -c $src -o $obj"
+ 			echo "$rule" >>$rulesf
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -630,14 +630,13 @@ if test "$MACHDEP" = "irix6" && test "$C
+     fi
+ fi
+ 
+-# If the user set CFLAGS, use this instead of the automatically
+-# determined setting
+-preset_cflags="$CFLAGS"
+-AC_PROG_CC
+-if test ! -z "$preset_cflags"
+-then
+-	CFLAGS=$preset_cflags
++# Don't let AC_PROG_CC set the default CFLAGS. It normally sets -g -O2
++# when the compiler supports them, but we don't always want -O2, and
++# we set -g later.
++if test -z "$CFLAGS"; then
++        CFLAGS=
+ fi
++AC_PROG_CC
+ 
+ AC_SUBST(CXX)
+ AC_SUBST(MAINCC)
+Index: b/Lib/distutils/sysconfig.py
+===================================================================
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -320,11 +320,19 @@ def parse_makefile(fn, g=None):
+                     done[n] = v
+ 
+     # do variable interpolation here
+-    while notdone:
+-        for name in notdone.keys():
++    variables = list(notdone.keys())
++
++    # Variables with a 'PY_' prefix in the makefile. These need to
++    # be made available without that prefix through sysconfig.
++    # Special care is needed to ensure that variable expansion works, even
++    # if the expansion uses the name without a prefix.
++    renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS')
++
++    while len(variables) > 0:
++        for name in tuple(variables):
+             value = notdone[name]
+             m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+-            if m:
++            if m is not None:
+                 n = m.group(1)
+                 found = True
+                 if n in done:
+@@ -335,25 +343,47 @@ def parse_makefile(fn, g=None):
+                 elif n in os.environ:
+                     # do it like make: fall back to environment
+                     item = os.environ[n]
++
++                elif n in renamed_variables:
++                    if name.startswith('PY_') and name[3:] in renamed_variables:
++                        item = ""
++
++                    elif 'PY_' + n in notdone:
++                        found = False
++
++                    else:
++                        item = str(done['PY_' + n])
++
+                 else:
+                     done[n] = item = ""
++
+                 if found:
+                     after = value[m.end():]
+                     value = value[:m.start()] + item + after
+                     if "$" in after:
+                         notdone[name] = value
+                     else:
+-                        try: value = int(value)
++                        try:
++                            value = int(value)
+                         except ValueError:
+                             done[name] = value.strip()
+                         else:
+                             done[name] = value
+-                        del notdone[name]
+-            else:
+-                # bogus variable reference; just drop it since we can't deal
+-                del notdone[name]
++                        variables.remove(name)
++
++                        if name.startswith('PY_') \
++                        and name[3:] in renamed_variables:
+ 
+-    fp.close()
++                            name = name[3:]
++                            if name not in done:
++                                done[name] = value
++
++
++            else:
++                # bogus variable reference (e.g. "prefix=$/opt/python");
++                # just drop it since we can't deal
++                done[name] = value
++                variables.remove(name)
+ 
+     # strip spurious spaces
+     for k, v in done.items():
--- python2.7-2.7.12.orig/debian/patches/langpack-gettext.diff
+++ python2.7-2.7.12/debian/patches/langpack-gettext.diff
@@ -0,0 +1,34 @@
+# DP: Description: support alternative gettext tree in
+# DP: /usr/share/locale-langpack; if a file is present in both trees,
+# DP: prefer the newer one
+# DP: Upstream status: Ubuntu-Specific
+
+--- a/Lib/gettext.py
++++ b/Lib/gettext.py
+@@ -446,11 +446,26 @@
+         if lang == 'C':
+             break
+         mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain)
++        mofile_lp = os.path.join("/usr/share/locale-langpack", lang,
++                               'LC_MESSAGES', '%s.mo' % domain)
++
++	# first look into the standard locale dir, then into the 
++	# langpack locale dir
++
++	# standard mo file
+         if os.path.exists(mofile):
+             if all:
+                 result.append(mofile)
+             else:
+                 return mofile
++        
++	# langpack mofile -> use it
++        if os.path.exists(mofile_lp): 
++            if all:
++                result.append(mofile_lp)
++            else:
++                return mofile_lp
++
+     return result
+ 
+ 
--- python2.7-2.7.12.orig/debian/patches/lib2to3-no-pickled-grammar.diff
+++ python2.7-2.7.12/debian/patches/lib2to3-no-pickled-grammar.diff
@@ -0,0 +1,14 @@
+--- a/Lib/lib2to3/pgen2/driver.py
++++ b/Lib/lib2to3/pgen2/driver.py
+@@ -119,7 +119,10 @@
+     if force or not _newer(gp, gt):
+         logger.info("Generating grammar tables from %s", gt)
+         g = pgen.generate_grammar(gt)
+-        if save:
++        # the pickle files mismatch, when built on different architectures.
++        # don't save these for now. An alternative solution might be to
++        # include the multiarch triplet into the file name
++        if False:
+             logger.info("Writing grammar tables to %s", gp)
+             try:
+                 g.dump(gp)
--- python2.7-2.7.12.orig/debian/patches/libffi-shared.diff
+++ python2.7-2.7.12/debian/patches/libffi-shared.diff
@@ -0,0 +1,13 @@
+Index: b/setup.py
+===================================================================
+--- a/setup.py
++++ b/setup.py
+@@ -2151,7 +2151,7 @@ class PyBuildExt(build_ext):
+                     break
+         ffi_lib = None
+         if ffi_inc is not None:
+-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
++            for lib_name in ('ffi', 'ffi_convenience', 'ffi_pic', 'ffi'):
+                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
+                     ffi_lib = lib_name
+                     break
--- python2.7-2.7.12.orig/debian/patches/libre.diff
+++ python2.7-2.7.12/debian/patches/libre.diff
@@ -0,0 +1,9 @@
+--- Doc/lib/libre.tex~	2003-07-25 09:29:22.000000000 +0200
++++ Doc/lib/libre.tex	2003-07-25 09:30:58.000000000 +0200
+@@ -919,5 +919,5 @@
+ Starting with Python 2.3, simple uses of the \regexp{*?} pattern are
+ special-cased to avoid recursion.  Thus, the above regular expression
+ can avoid recursion by being recast as
+-\regexp{Begin [a-zA-Z0-9_ ]*?end}.  As a further benefit, such regular
++`Begin [a-zA-Z0-9_ ]*?end'.  As a further benefit, such regular
+ expressions will run faster than their recursive equivalents.
--- python2.7-2.7.12.orig/debian/patches/link-opt.diff
+++ python2.7-2.7.12/debian/patches/link-opt.diff
@@ -0,0 +1,26 @@
+# DP: Call the linker with -O1 -Bsymbolic-functions
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -2145,8 +2145,8 @@ then
+ 		fi
+ 		;;
+ 	Linux*|GNU*|QNX*)
+-		LDSHARED='$(CC) -shared'
+-		LDCXXSHARED='$(CXX) -shared';;
++		LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
++		LDCXXSHARED='$(CXX) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';;
+ 	BSD/OS*/4*)
+ 		LDSHARED="gcc -shared"
+ 		LDCXXSHARED="g++ -shared";;
+@@ -2248,7 +2248,7 @@ then
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
++	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions";;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*) 
+ 		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
--- python2.7-2.7.12.orig/debian/patches/link-system-expat.diff
+++ python2.7-2.7.12/debian/patches/link-system-expat.diff
@@ -0,0 +1,22 @@
+# DP: Link with the system expat
+
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -181,7 +181,7 @@
+ #itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+ #strop stropmodule.c		# String manipulations
+ #_functools _functoolsmodule.c	# Tools for working with functions and callable objects
+-#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
++#_elementtree -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
+ #_pickle _pickle.c	# pickle accelerator
+ #datetime datetimemodule.c	# date/time type
+ #_bisect _bisectmodule.c	# Bisection algorithms
+@@ -475,7 +475,7 @@
+ #
+ # More information on Expat can be found at www.libexpat.org.
+ #
+-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
++#pyexpat pyexpat.c -lexpat
+ 
+ 
+ # Hye-Shik Chang's CJKCodecs
--- python2.7-2.7.12.orig/debian/patches/link-whole-archive.diff
+++ python2.7-2.7.12/debian/patches/link-whole-archive.diff
@@ -0,0 +1,15 @@
+# DP: Link libpython with --whole-archive.
+
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -518,7 +518,7 @@ coverage-report:
+ $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
+ 		$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+-			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++			-Wl,--whole-archive $(BLDLIBRARY) -Wl,--no-whole-archive $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ platform: $(BUILDPYTHON) pybuilddir.txt
+ 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
--- python2.7-2.7.12.orig/debian/patches/locale-module.diff
+++ python2.7-2.7.12/debian/patches/locale-module.diff
@@ -0,0 +1,19 @@
+# DP:   * Lib/locale.py:
+# DP:     - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding
+# DP:       for glibc.
+
+Index: b/Lib/locale.py
+===================================================================
+--- a/Lib/locale.py
++++ b/Lib/locale.py
+@@ -1701,8 +1701,8 @@ locale_alias = {
+     'uk_ua.iso88595':                       'uk_UA.ISO8859-5',
+     'uk_ua.koi8u':                          'uk_UA.KOI8-U',
+     'uk_ua.microsoftcp1251':                'uk_UA.CP1251',
+-    'univ':                                 'en_US.utf',
+-    'universal':                            'en_US.utf',
++    'univ':                                 'en_US.UTF-8',
++    'universal':                            'en_US.UTF-8',
+     'universal.utf8@ucs4':                  'en_US.UTF-8',
+     'unm_us':                               'unm_US.UTF-8',
+     'ur':                                   'ur_PK.CP1256',
--- python2.7-2.7.12.orig/debian/patches/lto-link-flags.diff
+++ python2.7-2.7.12/debian/patches/lto-link-flags.diff
@@ -0,0 +1,24 @@
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -128,8 +128,8 @@ LIBP=		$(LIBDIR)/python$(VERSION)
+ 
+ # Symbols used for using shared libraries
+ SO=		@SO@
+-LDSHARED=	@LDSHARED@ $(LDFLAGS)
+-BLDSHARED=	@BLDSHARED@ $(LDFLAGS)
++LDSHARED=	@LDSHARED@ $(PY_LDFLAGS)
++BLDSHARED=	@BLDSHARED@ $(PY_LDFLAGS) $(PY_CFLAGS)
+ LDCXXSHARED=	@LDCXXSHARED@
+ DESTSHARED=	$(BINLIBDEST)/lib-dynload
+ 
+@@ -516,7 +516,7 @@ coverage-report:
+ 
+ # Build the interpreter
+ $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
+-		$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ \
++		$(LINKCC) $(PY_LDFLAGS) $(PY_CFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+ 			-Wl,--whole-archive $(BLDLIBRARY) -Wl,--no-whole-archive $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
--- python2.7-2.7.12.orig/debian/patches/makesetup-bashism.diff
+++ python2.7-2.7.12/debian/patches/makesetup-bashism.diff
@@ -0,0 +1,13 @@
+# DP: Fix bashism in makesetup shell script
+
+--- a/Modules/makesetup
++++ b/Modules/makesetup
+@@ -281,7 +281,7 @@
+ 	-)	;;
+ 	*)	sedf="@sed.in.$$"
+ 		trap 'rm -f $sedf' 0 1 2 3
+-		echo "1i\\" >$sedf
++		printf "1i\\" >$sedf
+ 		str="# Generated automatically from $makepre by makesetup."
+ 		echo "$str" >>$sedf
+ 		echo "s%_MODOBJS_%$OBJS%" >>$sedf
--- python2.7-2.7.12.orig/debian/patches/mangle-fstack-protector.diff
+++ python2.7-2.7.12/debian/patches/mangle-fstack-protector.diff
@@ -0,0 +1,24 @@
+# DP: When using GCC versions older than 4.9, automagically mangle
+# DP: -fstack-protector-strong to -fstack-protector
+
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -15,6 +15,7 @@ import os
+ import re
+ import string
+ import sys
++import fnmatch
+ 
+ from distutils.errors import DistutilsPlatformError
+ 
+@@ -197,6 +198,10 @@ def customize_compiler(compiler):
+             cc = newcc
+         if 'CXX' in os.environ:
+             cxx = os.environ['CXX']
++        if fnmatch.filter([cc, cxx], '*-4.[0-8]'):
++            configure_cflags = configure_cflags.replace('-fstack-protector-strong', '-fstack-protector')
++            ldshared = ldshared.replace('-fstack-protector-strong', '-fstack-protector')
++            cflags = cflags.replace('-fstack-protector-strong', '-fstack-protector')
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
+         if 'CPP' in os.environ:
--- python2.7-2.7.12.orig/debian/patches/multiarch.diff
+++ python2.7-2.7.12/debian/patches/multiarch.diff
@@ -0,0 +1,166 @@
+Index: b/Lib/sysconfig.py
+===================================================================
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -333,7 +333,7 @@ def get_makefile_filename():
+     """Return the path of the Makefile."""
+     if _PYTHON_BUILD:
+         return os.path.join(_PROJECT_BASE, "Makefile")
+-    return os.path.join(get_path('platstdlib').replace("/usr/local","/usr",1), "config" + (sys.pydebug and "_d" or ""), "Makefile")
++    return os.path.join(get_config_var('LIBPL'), "Makefile")
+ 
+ # Issue #22199: retain undocumented private name for compatibility
+ _get_makefile_filename = get_makefile_filename
+@@ -532,6 +532,12 @@ def get_config_vars(*args):
+         # the init-function.
+         _CONFIG_VARS['userbase'] = _getuserbase()
+ 
++        multiarch = get_config_var('MULTIARCH')
++        if multiarch:
++            _CONFIG_VARS['multiarchsubdir'] = '/' + multiarch
++        else:
++            _CONFIG_VARS['multiarchsubdir'] = ''
++
+         if 'srcdir' not in _CONFIG_VARS:
+             _CONFIG_VARS['srcdir'] = _PROJECT_BASE
+ 
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -102,6 +102,9 @@ MACHDEP=	@MACHDEP@
+ # Multiarch directory (may be empty)
+ MULTIARCH=	@MULTIARCH@
+ 
++# Multiarch directory (may be empty)
++MULTIARCH=	@MULTIARCH@
++
+ # Install prefix for architecture-independent files
+ prefix=		@prefix@
+ 
+@@ -643,6 +646,10 @@ Makefile Modules/config.c: Makefile.pre
+ 	@mv config.c Modules
+ 	@echo "The Makefile was updated, you may need to re-run make."
+ 
++Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
++	$(CC) -c $(PY_CORE_CFLAGS) \
++		$(if $(MULTIARCH),-DMULTIARCH='"$(MULTIARCH)"') \
++		-o $@ $(srcdir)/Python/dynload_shlib.c
+ 
+ Modules/Setup: $(srcdir)/Modules/Setup.dist
+ 	@if test -f Modules/Setup; then \
+@@ -1205,10 +1212,10 @@ inclinstall:
+ 
+ # Install the library and miscellaneous stuff needed for extending/embedding
+ # This goes into $(exec_prefix)$(DEBUG_EXT)
+-LIBPL=		$(LIBP)/config$(DEBUG_EXT)
++LIBPL=		$(LIBP)/config-$(MULTIARCH)$(DEBUG_EXT)
+ 
+ # pkgconfig directory
+-LIBPC=		$(LIBDIR)/pkgconfig
++LIBPC=		$(LIBDIR)/$(MULTIARCH)/pkgconfig
+ 
+ libainstall:	all python-config
+ 	@for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
+@@ -1487,6 +1494,11 @@ patchcheck:
+ 
+ Python/thread.o: @THREADHEADERS@
+ 
++Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
++	$(CC) -c $(PY_CORE_CFLAGS) \
++		-DMULTIARCH='"$(MULTIARCH)"' \
++		-o $@ $(srcdir)/Python/sysmodule.c
++
+ # Declare targets that aren't real files
+ .PHONY: all build_all sharedmods oldsharedmods test quicktest memtest
+ .PHONY: install altinstall oldsharedinstall bininstall altbininstall
+Index: b/Python/dynload_shlib.c
+===================================================================
+--- a/Python/dynload_shlib.c
++++ b/Python/dynload_shlib.c
+@@ -49,6 +49,12 @@ const struct filedescr _PyImport_DynLoad
+ #ifdef Py_DEBUG
+     {"_d.so", "rb", C_EXTENSION},
+     {"module_d.so", "rb", C_EXTENSION},
++# ifdef MULTIARCH
++    {"." MULTIARCH "_d.so", "rb", C_EXTENSION},
++# endif
++#endif
++#ifdef MULTIARCH
++    {"." MULTIARCH ".so", "rb", C_EXTENSION},
+ #endif
+     {".so", "rb", C_EXTENSION},
+     {"module.so", "rb", C_EXTENSION},
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -494,8 +494,16 @@ then
+ fi
+ AC_MSG_RESULT($MACHDEP)
+ 
++MULTIARCH=$($CC --print-multiarch 2>/dev/null)
++AC_SUBST(MULTIARCH)
++
++
+ AC_SUBST(PLATDIR)
+-PLATDIR=plat-$MACHDEP
++if test -n "$MULTIARCH"; then
++  PLATDIR=plat-$MULTIARCH
++else
++  PLATDIR=plat-$MACHDEP
++fi
+ 
+ # And add extra plat-mac for darwin
+ AC_SUBST(EXTRAPLATDIR)
+Index: b/Lib/distutils/sysconfig.py
+===================================================================
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -74,8 +74,6 @@ def get_python_inc(plat_specific=0, pref
+     If 'prefix' is supplied, use it instead of sys.prefix or
+     sys.exec_prefix -- i.e., ignore 'plat_specific'.
+     """
+-    if prefix is None:
+-        prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
+         if python_build:
+@@ -90,7 +88,14 @@ def get_python_inc(plat_specific=0, pref
+                 # Include is located in the srcdir
+                 inc_dir = os.path.join(srcdir, "Include")
+             return inc_dir
+-        return os.path.join(prefix, "include", "python" + get_python_version())+(sys.pydebug and "_d" or "")
++        else:
++            if not (prefix is None):
++                return os.path.join(prefix, "include",
++                                    "python" + get_python_version())+(sys.pydebug and "_d" or "")
++            if plat_specific:
++                return get_config_var('CONFINCLUDEPY')
++            else:
++                return get_config_var('INCLUDEPY')
+     elif os.name == "nt":
+         return os.path.join(prefix, "include")
+     elif os.name == "os2":
+@@ -263,7 +268,7 @@ def get_makefile_filename():
+     if python_build:
+         return os.path.join(project_base, "Makefile")
+     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+-    return os.path.join(lib_dir, "config"+(sys.pydebug and "_d" or ""), "Makefile")
++    return os.path.join(get_config_var('LIBPL'), "Makefile")
+ 
+ 
+ def parse_config_h(fp, g=None):
+Index: b/Python/sysmodule.c
+===================================================================
+--- a/Python/sysmodule.c
++++ b/Python/sysmodule.c
+@@ -1453,6 +1453,8 @@ _PySys_Init(void)
+                         PyFloat_GetInfo());
+     SET_SYS_FROM_STRING("long_info",
+                         PyLong_GetInfo());
++    SET_SYS_FROM_STRING("_multiarch",
++                        PyString_FromString(MULTIARCH));
+ #ifdef Py_USING_UNICODE
+     SET_SYS_FROM_STRING("maxunicode",
+                         PyInt_FromLong(PyUnicode_GetMax()));
--- python2.7-2.7.12.orig/debian/patches/no-large-file-support.diff
+++ python2.7-2.7.12/debian/patches/no-large-file-support.diff
@@ -0,0 +1,14 @@
+# DP: disable large file support for GNU/Hurd
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1434,6 +1434,9 @@
+   use_lfs=no
+ fi
+ 
++# Don't use largefile support anyway.
++use_lfs=no
++
+ if test "$use_lfs" = "yes"; then
+ # Two defines needed to enable largefile support on various platforms
+ # These may affect some typedefs
--- python2.7-2.7.12.orig/debian/patches/no-zip-on-sys.path.diff
+++ python2.7-2.7.12/debian/patches/no-zip-on-sys.path.diff
@@ -0,0 +1,54 @@
+# DP: Do not add /usr/lib/pythonXY.zip on sys.path.
+
+Index: b/Modules/getpath.c
+===================================================================
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
+@@ -374,7 +374,9 @@ calculate_path(void)
+     char *path = getenv("PATH");
+     char *prog = Py_GetProgramName();
+     char argv0_path[MAXPATHLEN+1];
++#ifdef WITH_ZIP_PATH
+     char zip_path[MAXPATHLEN+1];
++#endif
+     int pfound, efound; /* 1 if found; -1 if found build directory */
+     char *buf;
+     size_t bufsz;
+@@ -514,6 +516,7 @@ calculate_path(void)
+     else
+         reduce(prefix);
+ 
++#ifdef WITH_ZIP_PATH
+     strncpy(zip_path, prefix, MAXPATHLEN);
+     zip_path[MAXPATHLEN] = '\0';
+     if (pfound > 0) { /* Use the reduced prefix returned by Py_GetPrefix() */
+@@ -526,6 +529,7 @@ calculate_path(void)
+     bufsz = strlen(zip_path);   /* Replace "00" with version */
+     zip_path[bufsz - 6] = VERSION[0];
+     zip_path[bufsz - 5] = VERSION[2];
++#endif
+ 
+     if (!(efound = search_for_exec_prefix(argv0_path, home))) {
+         if (!Py_FrozenFlag)
+@@ -565,7 +569,9 @@ calculate_path(void)
+         defpath = delim + 1;
+     }
+ 
++#ifdef WITH_ZIP_PATH
+     bufsz += strlen(zip_path) + 1;
++#endif
+     bufsz += strlen(exec_prefix) + 1;
+ 
+     /* This is the only malloc call in this file */
+@@ -586,9 +592,11 @@ calculate_path(void)
+         else
+             buf[0] = '\0';
+ 
++#ifdef WITH_ZIP_PATH
+         /* Next is the default zip path */
+         strcat(buf, zip_path);
+         strcat(buf, delimiter);
++#endif
+ 
+         /* Next goes merge of compile-time $PYTHONPATH with
+          * dynamically located prefix.
--- python2.7-2.7.12.orig/debian/patches/plat-gnukfreebsd.diff
+++ python2.7-2.7.12/debian/patches/plat-gnukfreebsd.diff
@@ -0,0 +1,2478 @@
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd7/IN.py
+@@ -0,0 +1,809 @@
++# Generated by h2py from /usr/include/netinet/in.h
++_NETINET_IN_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from stdint.h
++_STDINT_H = 1
++
++# Included from bits/wchar.h
++_BITS_WCHAR_H = 1
++__WCHAR_MAX = (2147483647)
++__WCHAR_MIN = (-__WCHAR_MAX - 1)
++def __INT64_C(c): return c ## L
++
++def __UINT64_C(c): return c ## UL
++
++def __INT64_C(c): return c ## LL
++
++def __UINT64_C(c): return c ## ULL
++
++INT8_MIN = (-128)
++INT16_MIN = (-32767-1)
++INT32_MIN = (-2147483647-1)
++INT64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT8_MAX = (127)
++INT16_MAX = (32767)
++INT32_MAX = (2147483647)
++INT64_MAX = (__INT64_C(9223372036854775807))
++UINT8_MAX = (255)
++UINT16_MAX = (65535)
++UINT64_MAX = (__UINT64_C(18446744073709551615))
++INT_LEAST8_MIN = (-128)
++INT_LEAST16_MIN = (-32767-1)
++INT_LEAST32_MIN = (-2147483647-1)
++INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT_LEAST8_MAX = (127)
++INT_LEAST16_MAX = (32767)
++INT_LEAST32_MAX = (2147483647)
++INT_LEAST64_MAX = (__INT64_C(9223372036854775807))
++UINT_LEAST8_MAX = (255)
++UINT_LEAST16_MAX = (65535)
++UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615))
++INT_FAST8_MIN = (-128)
++INT_FAST16_MIN = (-9223372036854775807L-1)
++INT_FAST32_MIN = (-9223372036854775807L-1)
++INT_FAST16_MIN = (-2147483647-1)
++INT_FAST32_MIN = (-2147483647-1)
++INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT_FAST8_MAX = (127)
++INT_FAST16_MAX = (9223372036854775807L)
++INT_FAST32_MAX = (9223372036854775807L)
++INT_FAST16_MAX = (2147483647)
++INT_FAST32_MAX = (2147483647)
++INT_FAST64_MAX = (__INT64_C(9223372036854775807))
++UINT_FAST8_MAX = (255)
++UINT_FAST64_MAX = (__UINT64_C(18446744073709551615))
++INTPTR_MIN = (-9223372036854775807L-1)
++INTPTR_MAX = (9223372036854775807L)
++INTPTR_MIN = (-2147483647-1)
++INTPTR_MAX = (2147483647)
++INTMAX_MIN = (-__INT64_C(9223372036854775807)-1)
++INTMAX_MAX = (__INT64_C(9223372036854775807))
++UINTMAX_MAX = (__UINT64_C(18446744073709551615))
++PTRDIFF_MIN = (-9223372036854775807L-1)
++PTRDIFF_MAX = (9223372036854775807L)
++PTRDIFF_MIN = (-2147483647-1)
++PTRDIFF_MAX = (2147483647)
++SIG_ATOMIC_MIN = (-2147483647-1)
++SIG_ATOMIC_MAX = (2147483647)
++WCHAR_MIN = __WCHAR_MIN
++WCHAR_MAX = __WCHAR_MAX
++def INT8_C(c): return c
++
++def INT16_C(c): return c
++
++def INT32_C(c): return c
++
++def INT64_C(c): return c ## L
++
++def INT64_C(c): return c ## LL
++
++def UINT8_C(c): return c
++
++def UINT16_C(c): return c
++
++def UINT32_C(c): return c ## U
++
++def UINT64_C(c): return c ## UL
++
++def UINT64_C(c): return c ## ULL
++
++def INTMAX_C(c): return c ## L
++
++def UINTMAX_C(c): return c ## UL
++
++def INTMAX_C(c): return c ## LL
++
++def UINTMAX_C(c): return c ## ULL
++
++
++# Included from sys/socket.h
++_SYS_SOCKET_H = 1
++
++# Included from sys/uio.h
++_SYS_UIO_H = 1
++from TYPES import *
++
++# Included from bits/uio.h
++_BITS_UIO_H = 1
++from TYPES import *
++UIO_MAXIOV = 1024
++
++# Included from bits/sigset.h
++_SIGSET_H_types = 1
++_SIGSET_H_fns = 1
++def __sigword(sig): return (((sig) - 1) >> 5)
++
++def __sigemptyset(set): return \
++
++def __sigfillset(set): return \
++
++def __sigisemptyset(set): return \
++
++
++# Included from bits/socket.h
++__BITS_SOCKET_H = 1
++
++# Included from limits.h
++_LIBC_LIMITS_H_ = 1
++MB_LEN_MAX = 16
++_LIMITS_H = 1
++CHAR_BIT = 8
++SCHAR_MIN = (-128)
++SCHAR_MAX = 127
++UCHAR_MAX = 255
++CHAR_MIN = 0
++CHAR_MAX = UCHAR_MAX
++CHAR_MIN = SCHAR_MIN
++CHAR_MAX = SCHAR_MAX
++SHRT_MIN = (-32768)
++SHRT_MAX = 32767
++USHRT_MAX = 65535
++INT_MAX = 2147483647
++LONG_MAX = 9223372036854775807L
++LONG_MAX = 2147483647L
++LONG_MIN = (-LONG_MAX - 1L)
++
++# Included from bits/posix1_lim.h
++_BITS_POSIX1_LIM_H = 1
++_POSIX_AIO_LISTIO_MAX = 2
++_POSIX_AIO_MAX = 1
++_POSIX_ARG_MAX = 4096
++_POSIX_CHILD_MAX = 25
++_POSIX_CHILD_MAX = 6
++_POSIX_DELAYTIMER_MAX = 32
++_POSIX_HOST_NAME_MAX = 255
++_POSIX_LINK_MAX = 8
++_POSIX_LOGIN_NAME_MAX = 9
++_POSIX_MAX_CANON = 255
++_POSIX_MAX_INPUT = 255
++_POSIX_MQ_OPEN_MAX = 8
++_POSIX_MQ_PRIO_MAX = 32
++_POSIX_NAME_MAX = 14
++_POSIX_NGROUPS_MAX = 8
++_POSIX_NGROUPS_MAX = 0
++_POSIX_OPEN_MAX = 20
++_POSIX_OPEN_MAX = 16
++_POSIX_FD_SETSIZE = _POSIX_OPEN_MAX
++_POSIX_PATH_MAX = 256
++_POSIX_PIPE_BUF = 512
++_POSIX_RE_DUP_MAX = 255
++_POSIX_RTSIG_MAX = 8
++_POSIX_SEM_NSEMS_MAX = 256
++_POSIX_SEM_VALUE_MAX = 32767
++_POSIX_SIGQUEUE_MAX = 32
++_POSIX_SSIZE_MAX = 32767
++_POSIX_STREAM_MAX = 8
++_POSIX_SYMLINK_MAX = 255
++_POSIX_SYMLOOP_MAX = 8
++_POSIX_TIMER_MAX = 32
++_POSIX_TTY_NAME_MAX = 9
++_POSIX_TZNAME_MAX = 6
++_POSIX_QLIMIT = 1
++_POSIX_HIWAT = _POSIX_PIPE_BUF
++_POSIX_UIO_MAXIOV = 16
++_POSIX_CLOCKRES_MIN = 20000000
++
++# Included from bits/local_lim.h
++
++# Included from sys/syslimits.h
++ARG_MAX = 262144
++CHILD_MAX = 40
++LINK_MAX = 32767
++MAX_CANON = 255
++MAX_INPUT = 255
++NAME_MAX = 255
++NGROUPS_MAX = 1023
++OPEN_MAX = 64
++PATH_MAX = 1024
++PIPE_BUF = 512
++IOV_MAX = 1024
++_POSIX_THREAD_KEYS_MAX = 128
++PTHREAD_KEYS_MAX = 1024
++_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4
++PTHREAD_DESTRUCTOR_ITERATIONS = _POSIX_THREAD_DESTRUCTOR_ITERATIONS
++_POSIX_THREAD_THREADS_MAX = 64
++PTHREAD_THREADS_MAX = 1024
++AIO_PRIO_DELTA_MAX = 20
++PTHREAD_STACK_MIN = 16384
++TIMER_MAX = 256
++DELAYTIMER_MAX = 2147483647
++SSIZE_MAX = LONG_MAX
++NGROUPS_MAX = 8
++
++# Included from bits/posix2_lim.h
++_BITS_POSIX2_LIM_H = 1
++_POSIX2_BC_BASE_MAX = 99
++_POSIX2_BC_DIM_MAX = 2048
++_POSIX2_BC_SCALE_MAX = 99
++_POSIX2_BC_STRING_MAX = 1000
++_POSIX2_COLL_WEIGHTS_MAX = 2
++_POSIX2_EXPR_NEST_MAX = 32
++_POSIX2_LINE_MAX = 2048
++_POSIX2_RE_DUP_MAX = 255
++_POSIX2_CHARCLASS_NAME_MAX = 14
++BC_BASE_MAX = _POSIX2_BC_BASE_MAX
++BC_DIM_MAX = _POSIX2_BC_DIM_MAX
++BC_SCALE_MAX = _POSIX2_BC_SCALE_MAX
++BC_STRING_MAX = _POSIX2_BC_STRING_MAX
++COLL_WEIGHTS_MAX = 255
++EXPR_NEST_MAX = _POSIX2_EXPR_NEST_MAX
++LINE_MAX = _POSIX2_LINE_MAX
++CHARCLASS_NAME_MAX = 2048
++RE_DUP_MAX = (0x7fff)
++
++# Included from bits/xopen_lim.h
++_XOPEN_LIM_H = 1
++
++# Included from bits/stdio_lim.h
++L_tmpnam = 20
++TMP_MAX = 238328
++FILENAME_MAX = 1024
++L_ctermid = 9
++L_cuserid = 9
++FOPEN_MAX = 64
++IOV_MAX = 1024
++_XOPEN_IOV_MAX = _POSIX_UIO_MAXIOV
++NL_ARGMAX = _POSIX_ARG_MAX
++NL_LANGMAX = _POSIX2_LINE_MAX
++NL_MSGMAX = INT_MAX
++NL_NMAX = INT_MAX
++NL_SETMAX = INT_MAX
++NL_TEXTMAX = INT_MAX
++NZERO = 20
++WORD_BIT = 16
++WORD_BIT = 32
++WORD_BIT = 64
++WORD_BIT = 16
++WORD_BIT = 32
++WORD_BIT = 64
++WORD_BIT = 32
++LONG_BIT = 32
++LONG_BIT = 64
++LONG_BIT = 32
++LONG_BIT = 64
++LONG_BIT = 64
++LONG_BIT = 32
++
++# Included from bits/types.h
++_BITS_TYPES_H = 1
++__S32_TYPE = int
++__SWORD_TYPE = int
++__SLONG32_TYPE = int
++
++# Included from bits/typesizes.h
++_BITS_TYPESIZES_H = 1
++__PID_T_TYPE = __S32_TYPE
++__CLOCK_T_TYPE = __S32_TYPE
++__SWBLK_T_TYPE = __S32_TYPE
++__CLOCKID_T_TYPE = __S32_TYPE
++__TIMER_T_TYPE = __S32_TYPE
++__SSIZE_T_TYPE = __SWORD_TYPE
++__FD_SETSIZE = 1024
++PF_UNSPEC = 0
++PF_LOCAL = 1
++PF_UNIX = PF_LOCAL
++PF_FILE = PF_LOCAL
++PF_INET = 2
++PF_IMPLINK = 3
++PF_PUP = 4
++PF_CHAOS = 5
++PF_NS = 6
++PF_ISO = 7
++PF_OSI = PF_ISO
++PF_ECMA = 8
++PF_DATAKIT = 9
++PF_CCITT = 10
++PF_SNA = 11
++PF_DECnet = 12
++PF_DLI = 13
++PF_LAT = 14
++PF_HYLINK = 15
++PF_APPLETALK = 16
++PF_ROUTE = 17
++PF_LINK = 18
++PF_XTP = 19
++PF_COIP = 20
++PF_CNT = 21
++PF_RTIP = 22
++PF_IPX = 23
++PF_SIP = 24
++PF_PIP = 25
++PF_ISDN = 26
++PF_KEY = 27
++PF_INET6 = 28
++PF_NATM = 29
++PF_ATM = 30
++PF_HDRCMPLT = 31
++PF_NETGRAPH = 32
++PF_MAX = 33
++AF_UNSPEC = PF_UNSPEC
++AF_LOCAL = PF_LOCAL
++AF_UNIX = PF_UNIX
++AF_FILE = PF_FILE
++AF_INET = PF_INET
++AF_IMPLINK = PF_IMPLINK
++AF_PUP = PF_PUP
++AF_CHAOS = PF_CHAOS
++AF_NS = PF_NS
++AF_ISO = PF_ISO
++AF_OSI = PF_OSI
++AF_ECMA = PF_ECMA
++AF_DATAKIT = PF_DATAKIT
++AF_CCITT = PF_CCITT
++AF_SNA = PF_SNA
++AF_DECnet = PF_DECnet
++AF_DLI = PF_DLI
++AF_LAT = PF_LAT
++AF_HYLINK = PF_HYLINK
++AF_APPLETALK = PF_APPLETALK
++AF_ROUTE = PF_ROUTE
++AF_LINK = PF_LINK
++pseudo_AF_XTP = PF_XTP
++AF_COIP = PF_COIP
++AF_CNT = PF_CNT
++pseudo_AF_RTIP = PF_RTIP
++AF_IPX = PF_IPX
++AF_SIP = PF_SIP
++pseudo_AF_PIP = PF_PIP
++AF_ISDN = PF_ISDN
++AF_E164 = AF_ISDN
++pseudo_AF_KEY = PF_KEY
++AF_INET6 = PF_INET6
++AF_NATM = PF_NATM
++AF_ATM = PF_ATM
++pseudo_AF_HDRCMPLT = PF_HDRCMPLT
++AF_NETGRAPH = PF_NETGRAPH
++AF_MAX = PF_MAX
++SOMAXCONN = 128
++
++# Included from bits/sockaddr.h
++_BITS_SOCKADDR_H = 1
++def __SOCKADDR_COMMON(sa_prefix): return \
++
++_HAVE_SA_LEN = 1
++_SS_SIZE = 128
++def CMSG_FIRSTHDR(mhdr): return \
++
++CMGROUP_MAX = 16
++SOL_SOCKET = 0xffff
++LOCAL_PEERCRED = 0x001
++LOCAL_CREDS = 0x002
++LOCAL_CONNWAIT = 0x004
++
++# Included from bits/socket2.h
++def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0)
++
++IN_CLASSA_NET = (-16777216)
++IN_CLASSA_NSHIFT = 24
++IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET)
++IN_CLASSA_MAX = 128
++def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648))
++
++IN_CLASSB_NET = (-65536)
++IN_CLASSB_NSHIFT = 16
++IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET)
++IN_CLASSB_MAX = 65536
++def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824))
++
++IN_CLASSC_NET = (-256)
++IN_CLASSC_NSHIFT = 8
++IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET)
++def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912))
++
++def IN_MULTICAST(a): return IN_CLASSD(a)
++
++def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912))
++
++def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456))
++
++IN_LOOPBACKNET = 127
++INET_ADDRSTRLEN = 16
++INET6_ADDRSTRLEN = 46
++
++# Included from bits/in.h
++IMPLINK_IP = 155
++IMPLINK_LOWEXPER = 156
++IMPLINK_HIGHEXPER = 158
++IPPROTO_DIVERT = 258
++SOL_IP = 0
++IP_OPTIONS = 1
++IP_HDRINCL = 2
++IP_TOS = 3
++IP_TTL = 4
++IP_RECVOPTS = 5
++IP_RECVRETOPTS = 6
++IP_RECVDSTADDR = 7
++IP_SENDSRCADDR = IP_RECVDSTADDR
++IP_RETOPTS = 8
++IP_MULTICAST_IF = 9
++IP_MULTICAST_TTL = 10
++IP_MULTICAST_LOOP = 11
++IP_ADD_MEMBERSHIP = 12
++IP_DROP_MEMBERSHIP = 13
++IP_MULTICAST_VIF = 14
++IP_RSVP_ON = 15
++IP_RSVP_OFF = 16
++IP_RSVP_VIF_ON = 17
++IP_RSVP_VIF_OFF = 18
++IP_PORTRANGE = 19
++IP_RECVIF = 20
++IP_IPSEC_POLICY = 21
++IP_FAITH = 22
++IP_ONESBCAST = 23
++IP_NONLOCALOK = 24
++IP_FW_TABLE_ADD = 40
++IP_FW_TABLE_DEL = 41
++IP_FW_TABLE_FLUSH = 42
++IP_FW_TABLE_GETSIZE = 43
++IP_FW_TABLE_LIST = 44
++IP_FW_ADD = 50
++IP_FW_DEL = 51
++IP_FW_FLUSH = 52
++IP_FW_ZERO = 53
++IP_FW_GET = 54
++IP_FW_RESETLOG = 55
++IP_FW_NAT_CFG = 56
++IP_FW_NAT_DEL = 57
++IP_FW_NAT_GET_CONFIG = 58
++IP_FW_NAT_GET_LOG = 59
++IP_DUMMYNET_CONFIGURE = 60
++IP_DUMMYNET_DEL = 61
++IP_DUMMYNET_FLUSH = 62
++IP_DUMMYNET_GET = 64
++IP_RECVTTL = 65
++IP_MINTTL = 66
++IP_DONTFRAG = 67
++IP_ADD_SOURCE_MEMBERSHIP = 70
++IP_DROP_SOURCE_MEMBERSHIP = 71
++IP_BLOCK_SOURCE = 72
++IP_UNBLOCK_SOURCE = 73
++IP_MSFILTER = 74
++MCAST_JOIN_GROUP = 80
++MCAST_LEAVE_GROUP = 81
++MCAST_JOIN_SOURCE_GROUP = 82
++MCAST_LEAVE_SOURCE_GROUP = 83
++MCAST_BLOCK_SOURCE = 84
++MCAST_UNBLOCK_SOURCE = 85
++IP_DEFAULT_MULTICAST_TTL = 1
++IP_DEFAULT_MULTICAST_LOOP = 1
++IP_MIN_MEMBERSHIPS = 31
++IP_MAX_MEMBERSHIPS = 4095
++IP_MAX_SOURCE_FILTER = 1024
++MCAST_UNDEFINED = 0
++MCAST_INCLUDE = 1
++MCAST_EXCLUDE = 2
++IP_PORTRANGE_DEFAULT = 0
++IP_PORTRANGE_HIGH = 1
++IP_PORTRANGE_LOW = 2
++IPCTL_FORWARDING = 1
++IPCTL_SENDREDIRECTS = 2
++IPCTL_DEFTTL = 3
++IPCTL_DEFMTU = 4
++IPCTL_RTEXPIRE = 5
++IPCTL_RTMINEXPIRE = 6
++IPCTL_RTMAXCACHE = 7
++IPCTL_SOURCEROUTE = 8
++IPCTL_DIRECTEDBROADCAST = 9
++IPCTL_INTRQMAXLEN = 10
++IPCTL_INTRQDROPS = 11
++IPCTL_STATS = 12
++IPCTL_ACCEPTSOURCEROUTE = 13
++IPCTL_FASTFORWARDING = 14
++IPCTL_KEEPFAITH = 15
++IPCTL_GIF_TTL = 16
++IPCTL_MAXID = 17
++IPV6_SOCKOPT_RESERVED1 = 3
++IPV6_UNICAST_HOPS = 4
++IPV6_MULTICAST_IF = 9
++IPV6_MULTICAST_HOPS = 10
++IPV6_MULTICAST_LOOP = 11
++IPV6_JOIN_GROUP = 12
++IPV6_LEAVE_GROUP = 13
++IPV6_PORTRANGE = 14
++ICMP6_FILTER = 18
++IPV6_CHECKSUM = 26
++IPV6_V6ONLY = 27
++IPV6_IPSEC_POLICY = 28
++IPV6_FAITH = 29
++IPV6_FW_ADD = 30
++IPV6_FW_DEL = 31
++IPV6_FW_FLUSH = 32
++IPV6_FW_ZERO = 33
++IPV6_FW_GET = 34
++IPV6_RTHDRDSTOPTS = 35
++IPV6_RECVPKTINFO = 36
++IPV6_RECVHOPLIMIT = 37
++IPV6_RECVRTHDR = 38
++IPV6_RECVHOPOPTS = 39
++IPV6_RECVDSTOPTS = 40
++IPV6_USE_MIN_MTU = 42
++IPV6_RECVPATHMTU = 43
++IPV6_PATHMTU = 44
++IPV6_PKTINFO = 46
++IPV6_HOPLIMIT = 47
++IPV6_NEXTHOP = 48
++IPV6_HOPOPTS = 49
++IPV6_DSTOPTS = 50
++IPV6_RTHDR = 51
++IPV6_RECVTCLASS = 57
++IPV6_AUTOFLOWLABEL = 59
++IPV6_TCLASS = 61
++IPV6_DONTFRAG = 62
++IPV6_PREFER_TEMPADDR = 63
++IPV6_ADD_MEMBERSHIP = IPV6_JOIN_GROUP
++IPV6_DROP_MEMBERSHIP = IPV6_LEAVE_GROUP
++IPV6_RXHOPOPTS = IPV6_HOPOPTS
++IPV6_RXDSTOPTS = IPV6_DSTOPTS
++SOL_IPV6 = 41
++SOL_ICMPV6 = 58
++IPV6_DEFAULT_MULTICAST_HOPS = 1
++IPV6_DEFAULT_MULTICAST_LOOP = 1
++IPV6_PORTRANGE_DEFAULT = 0
++IPV6_PORTRANGE_HIGH = 1
++IPV6_PORTRANGE_LOW = 2
++IPV6_RTHDR_LOOSE = 0
++IPV6_RTHDR_STRICT = 1
++IPV6_RTHDR_TYPE_0 = 0
++IPV6CTL_FORWARDING = 1
++IPV6CTL_SENDREDIRECTS = 2
++IPV6CTL_DEFHLIM = 3
++IPV6CTL_FORWSRCRT = 5
++IPV6CTL_STATS = 6
++IPV6CTL_MRTSTATS = 7
++IPV6CTL_MRTPROTO = 8
++IPV6CTL_MAXFRAGPACKETS = 9
++IPV6CTL_SOURCECHECK = 10
++IPV6CTL_SOURCECHECK_LOGINT = 11
++IPV6CTL_ACCEPT_RTADV = 12
++IPV6CTL_KEEPFAITH = 13
++IPV6CTL_LOG_INTERVAL = 14
++IPV6CTL_HDRNESTLIMIT = 15
++IPV6CTL_DAD_COUNT = 16
++IPV6CTL_AUTO_FLOWLABEL = 17
++IPV6CTL_DEFMCASTHLIM = 18
++IPV6CTL_GIF_HLIM = 19
++IPV6CTL_KAME_VERSION = 20
++IPV6CTL_USE_DEPRECATED = 21
++IPV6CTL_RR_PRUNE = 22
++IPV6CTL_V6ONLY = 24
++IPV6CTL_RTEXPIRE = 25
++IPV6CTL_RTMINEXPIRE = 26
++IPV6CTL_RTMAXCACHE = 27
++IPV6CTL_USETEMPADDR = 32
++IPV6CTL_TEMPPLTIME = 33
++IPV6CTL_TEMPVLTIME = 34
++IPV6CTL_AUTO_LINKLOCAL = 35
++IPV6CTL_RIP6STATS = 36
++IPV6CTL_PREFER_TEMPADDR = 37
++IPV6CTL_ADDRCTLPOLICY = 38
++IPV6CTL_USE_DEFAULTZONE = 39
++IPV6CTL_MAXFRAGS = 41
++IPV6CTL_MCAST_PMTU = 44
++IPV6CTL_STEALTH = 45
++ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47
++IPV6CTL_MAXID = 48
++
++# Included from endian.h
++_ENDIAN_H = 1
++__LITTLE_ENDIAN = 1234
++__BIG_ENDIAN = 4321
++__PDP_ENDIAN = 3412
++
++# Included from bits/endian.h
++__BYTE_ORDER = __LITTLE_ENDIAN
++__FLOAT_WORD_ORDER = __BYTE_ORDER
++LITTLE_ENDIAN = __LITTLE_ENDIAN
++BIG_ENDIAN = __BIG_ENDIAN
++PDP_ENDIAN = __PDP_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++
++# Included from bits/byteswap.h
++_BITS_BYTESWAP_H = 1
++def __bswap_constant_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_constant_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_constant_64(x): return \
++
++def __bswap_64(x): return \
++
++def htobe16(x): return __bswap_16 (x)
++
++def htole16(x): return (x)
++
++def be16toh(x): return __bswap_16 (x)
++
++def le16toh(x): return (x)
++
++def htobe32(x): return __bswap_32 (x)
++
++def htole32(x): return (x)
++
++def be32toh(x): return __bswap_32 (x)
++
++def le32toh(x): return (x)
++
++def htobe64(x): return __bswap_64 (x)
++
++def htole64(x): return (x)
++
++def be64toh(x): return __bswap_64 (x)
++
++def le64toh(x): return (x)
++
++def htobe16(x): return (x)
++
++def htole16(x): return __bswap_16 (x)
++
++def be16toh(x): return (x)
++
++def le16toh(x): return __bswap_16 (x)
++
++def htobe32(x): return (x)
++
++def htole32(x): return __bswap_32 (x)
++
++def be32toh(x): return (x)
++
++def le32toh(x): return __bswap_32 (x)
++
++def htobe64(x): return (x)
++
++def htole64(x): return __bswap_64 (x)
++
++def be64toh(x): return (x)
++
++def le64toh(x): return __bswap_64 (x)
++
++def ntohl(x): return (x)
++
++def ntohs(x): return (x)
++
++def htonl(x): return (x)
++
++def htons(x): return (x)
++
++def ntohl(x): return __bswap_32 (x)
++
++def ntohs(x): return __bswap_16 (x)
++
++def htonl(x): return __bswap_32 (x)
++
++def htons(x): return __bswap_16 (x)
++
++def IN6_IS_ADDR_UNSPECIFIED(a): return \
++
++def IN6_IS_ADDR_LOOPBACK(a): return \
++
++def IN6_IS_ADDR_LINKLOCAL(a): return \
++
++def IN6_IS_ADDR_SITELOCAL(a): return \
++
++def IN6_IS_ADDR_V4MAPPED(a): return \
++
++def IN6_IS_ADDR_V4COMPAT(a): return \
++
++def IN6_IS_ADDR_MC_NODELOCAL(a): return \
++
++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
++
++def IN6_IS_ADDR_MC_SITELOCAL(a): return \
++
++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
++
++def IN6_IS_ADDR_MC_GLOBAL(a): return \
++
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd7/TYPES.py
+@@ -0,0 +1,303 @@
++# Generated by h2py from /usr/include/sys/types.h
++_SYS_TYPES_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from bits/types.h
++_BITS_TYPES_H = 1
++__S32_TYPE = int
++__SWORD_TYPE = int
++__SLONG32_TYPE = int
++
++# Included from bits/typesizes.h
++_BITS_TYPESIZES_H = 1
++__PID_T_TYPE = __S32_TYPE
++__CLOCK_T_TYPE = __S32_TYPE
++__SWBLK_T_TYPE = __S32_TYPE
++__CLOCKID_T_TYPE = __S32_TYPE
++__TIMER_T_TYPE = __S32_TYPE
++__SSIZE_T_TYPE = __SWORD_TYPE
++__FD_SETSIZE = 1024
++
++# Included from time.h
++_TIME_H = 1
++
++# Included from bits/time.h
++_BITS_TIME_H = 1
++CLOCKS_PER_SEC = 1000000l
++CLK_TCK = 128
++CLOCK_REALTIME = 0
++CLOCK_PROCESS_CPUTIME_ID = 2
++CLOCK_THREAD_CPUTIME_ID = 3
++CLOCK_MONOTONIC = 4
++CLOCK_VIRTUAL = 1
++CLOCK_PROF = 2
++CLOCK_UPTIME = 5
++CLOCK_UPTIME_PRECISE = 7
++CLOCK_UPTIME_FAST = 8
++CLOCK_REALTIME_PRECISE = 9
++CLOCK_REALTIME_FAST = 10
++CLOCK_MONOTONIC_PRECISE = 11
++CLOCK_MONOTONIC_FAST = 12
++CLOCK_SECOND = 13
++TIMER_RELTIME = 0
++TIMER_ABSTIME = 1
++_STRUCT_TIMEVAL = 1
++CLK_TCK = CLOCKS_PER_SEC
++__clock_t_defined = 1
++__time_t_defined = 1
++__clockid_t_defined = 1
++__timer_t_defined = 1
++__timespec_defined = 1
++
++# Included from xlocale.h
++_XLOCALE_H = 1
++def __isleap(year): return \
++
++__BIT_TYPES_DEFINED__ = 1
++
++# Included from endian.h
++_ENDIAN_H = 1
++__LITTLE_ENDIAN = 1234
++__BIG_ENDIAN = 4321
++__PDP_ENDIAN = 3412
++
++# Included from bits/endian.h
++__BYTE_ORDER = __LITTLE_ENDIAN
++__FLOAT_WORD_ORDER = __BYTE_ORDER
++LITTLE_ENDIAN = __LITTLE_ENDIAN
++BIG_ENDIAN = __BIG_ENDIAN
++PDP_ENDIAN = __PDP_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++
++# Included from bits/byteswap.h
++_BITS_BYTESWAP_H = 1
++def __bswap_constant_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_constant_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_constant_64(x): return \
++
++def __bswap_64(x): return \
++
++def htobe16(x): return __bswap_16 (x)
++
++def htole16(x): return (x)
++
++def be16toh(x): return __bswap_16 (x)
++
++def le16toh(x): return (x)
++
++def htobe32(x): return __bswap_32 (x)
++
++def htole32(x): return (x)
++
++def be32toh(x): return __bswap_32 (x)
++
++def le32toh(x): return (x)
++
++def htobe64(x): return __bswap_64 (x)
++
++def htole64(x): return (x)
++
++def be64toh(x): return __bswap_64 (x)
++
++def le64toh(x): return (x)
++
++def htobe16(x): return (x)
++
++def htole16(x): return __bswap_16 (x)
++
++def be16toh(x): return (x)
++
++def le16toh(x): return __bswap_16 (x)
++
++def htobe32(x): return (x)
++
++def htole32(x): return __bswap_32 (x)
++
++def be32toh(x): return (x)
++
++def le32toh(x): return __bswap_32 (x)
++
++def htobe64(x): return (x)
++
++def htole64(x): return __bswap_64 (x)
++
++def be64toh(x): return (x)
++
++def le64toh(x): return __bswap_64 (x)
++
++
++# Included from sys/select.h
++_SYS_SELECT_H = 1
++
++# Included from bits/select.h
++def __FD_ZERO(fdsp): return \
++
++def __FD_ZERO(set): return \
++
++
++# Included from bits/sigset.h
++_SIGSET_H_types = 1
++_SIGSET_H_fns = 1
++def __sigword(sig): return (((sig) - 1) >> 5)
++
++def __sigemptyset(set): return \
++
++def __sigfillset(set): return \
++
++def __sigisemptyset(set): return \
++
++def __FDELT(d): return ((d) / __NFDBITS)
++
++FD_SETSIZE = __FD_SETSIZE
++def FD_ZERO(fdsetp): return __FD_ZERO (fdsetp)
++
++
++# Included from sys/sysmacros.h
++_SYS_SYSMACROS_H = 1
++def minor(dev): return ((int)((dev) & (-65281)))
++
++def gnu_dev_major(dev): return major (dev)
++
++def gnu_dev_minor(dev): return minor (dev)
++
++
++# Included from bits/pthreadtypes.h
++_BITS_PTHREADTYPES_H = 1
++
++# Included from bits/sched.h
++SCHED_OTHER = 2
++SCHED_FIFO = 1
++SCHED_RR = 3
++CSIGNAL = 0x000000ff
++CLONE_VM = 0x00000100
++CLONE_FS = 0x00000200
++CLONE_FILES = 0x00000400
++CLONE_SIGHAND = 0x00000800
++CLONE_PTRACE = 0x00002000
++CLONE_VFORK = 0x00004000
++CLONE_SYSVSEM = 0x00040000
++__defined_schedparam = 1
++__CPU_SETSIZE = 128
++def __CPUELT(cpu): return ((cpu) / __NCPUBITS)
++
++def __CPU_ALLOC_SIZE(count): return \
++
++def __CPU_ALLOC(count): return __sched_cpualloc (count)
++
++def __CPU_FREE(cpuset): return __sched_cpufree (cpuset)
++
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd7/DLFCN.py
+@@ -0,0 +1,118 @@
++# Generated by h2py from /usr/include/dlfcn.h
++_DLFCN_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from bits/dlfcn.h
++RTLD_LAZY = 0x00001
++RTLD_NOW = 0x00002
++RTLD_BINDING_MASK = 0x3
++RTLD_NOLOAD = 0x00004
++RTLD_DEEPBIND = 0x00008
++RTLD_GLOBAL = 0x00100
++RTLD_LOCAL = 0
++RTLD_NODELETE = 0x01000
++LM_ID_BASE = 0
++LM_ID_NEWLM = -1
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd8/IN.py
+@@ -0,0 +1,809 @@
++# Generated by h2py from /usr/include/netinet/in.h
++_NETINET_IN_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from stdint.h
++_STDINT_H = 1
++
++# Included from bits/wchar.h
++_BITS_WCHAR_H = 1
++__WCHAR_MAX = (2147483647)
++__WCHAR_MIN = (-__WCHAR_MAX - 1)
++def __INT64_C(c): return c ## L
++
++def __UINT64_C(c): return c ## UL
++
++def __INT64_C(c): return c ## LL
++
++def __UINT64_C(c): return c ## ULL
++
++INT8_MIN = (-128)
++INT16_MIN = (-32767-1)
++INT32_MIN = (-2147483647-1)
++INT64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT8_MAX = (127)
++INT16_MAX = (32767)
++INT32_MAX = (2147483647)
++INT64_MAX = (__INT64_C(9223372036854775807))
++UINT8_MAX = (255)
++UINT16_MAX = (65535)
++UINT64_MAX = (__UINT64_C(18446744073709551615))
++INT_LEAST8_MIN = (-128)
++INT_LEAST16_MIN = (-32767-1)
++INT_LEAST32_MIN = (-2147483647-1)
++INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT_LEAST8_MAX = (127)
++INT_LEAST16_MAX = (32767)
++INT_LEAST32_MAX = (2147483647)
++INT_LEAST64_MAX = (__INT64_C(9223372036854775807))
++UINT_LEAST8_MAX = (255)
++UINT_LEAST16_MAX = (65535)
++UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615))
++INT_FAST8_MIN = (-128)
++INT_FAST16_MIN = (-9223372036854775807L-1)
++INT_FAST32_MIN = (-9223372036854775807L-1)
++INT_FAST16_MIN = (-2147483647-1)
++INT_FAST32_MIN = (-2147483647-1)
++INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1)
++INT_FAST8_MAX = (127)
++INT_FAST16_MAX = (9223372036854775807L)
++INT_FAST32_MAX = (9223372036854775807L)
++INT_FAST16_MAX = (2147483647)
++INT_FAST32_MAX = (2147483647)
++INT_FAST64_MAX = (__INT64_C(9223372036854775807))
++UINT_FAST8_MAX = (255)
++UINT_FAST64_MAX = (__UINT64_C(18446744073709551615))
++INTPTR_MIN = (-9223372036854775807L-1)
++INTPTR_MAX = (9223372036854775807L)
++INTPTR_MIN = (-2147483647-1)
++INTPTR_MAX = (2147483647)
++INTMAX_MIN = (-__INT64_C(9223372036854775807)-1)
++INTMAX_MAX = (__INT64_C(9223372036854775807))
++UINTMAX_MAX = (__UINT64_C(18446744073709551615))
++PTRDIFF_MIN = (-9223372036854775807L-1)
++PTRDIFF_MAX = (9223372036854775807L)
++PTRDIFF_MIN = (-2147483647-1)
++PTRDIFF_MAX = (2147483647)
++SIG_ATOMIC_MIN = (-2147483647-1)
++SIG_ATOMIC_MAX = (2147483647)
++WCHAR_MIN = __WCHAR_MIN
++WCHAR_MAX = __WCHAR_MAX
++def INT8_C(c): return c
++
++def INT16_C(c): return c
++
++def INT32_C(c): return c
++
++def INT64_C(c): return c ## L
++
++def INT64_C(c): return c ## LL
++
++def UINT8_C(c): return c
++
++def UINT16_C(c): return c
++
++def UINT32_C(c): return c ## U
++
++def UINT64_C(c): return c ## UL
++
++def UINT64_C(c): return c ## ULL
++
++def INTMAX_C(c): return c ## L
++
++def UINTMAX_C(c): return c ## UL
++
++def INTMAX_C(c): return c ## LL
++
++def UINTMAX_C(c): return c ## ULL
++
++
++# Included from sys/socket.h
++_SYS_SOCKET_H = 1
++
++# Included from sys/uio.h
++_SYS_UIO_H = 1
++from TYPES import *
++
++# Included from bits/uio.h
++_BITS_UIO_H = 1
++from TYPES import *
++UIO_MAXIOV = 1024
++
++# Included from bits/sigset.h
++_SIGSET_H_types = 1
++_SIGSET_H_fns = 1
++def __sigword(sig): return (((sig) - 1) >> 5)
++
++def __sigemptyset(set): return \
++
++def __sigfillset(set): return \
++
++def __sigisemptyset(set): return \
++
++
++# Included from bits/socket.h
++__BITS_SOCKET_H = 1
++
++# Included from limits.h
++_LIBC_LIMITS_H_ = 1
++MB_LEN_MAX = 16
++_LIMITS_H = 1
++CHAR_BIT = 8
++SCHAR_MIN = (-128)
++SCHAR_MAX = 127
++UCHAR_MAX = 255
++CHAR_MIN = 0
++CHAR_MAX = UCHAR_MAX
++CHAR_MIN = SCHAR_MIN
++CHAR_MAX = SCHAR_MAX
++SHRT_MIN = (-32768)
++SHRT_MAX = 32767
++USHRT_MAX = 65535
++INT_MAX = 2147483647
++LONG_MAX = 9223372036854775807L
++LONG_MAX = 2147483647L
++LONG_MIN = (-LONG_MAX - 1L)
++
++# Included from bits/posix1_lim.h
++_BITS_POSIX1_LIM_H = 1
++_POSIX_AIO_LISTIO_MAX = 2
++_POSIX_AIO_MAX = 1
++_POSIX_ARG_MAX = 4096
++_POSIX_CHILD_MAX = 25
++_POSIX_CHILD_MAX = 6
++_POSIX_DELAYTIMER_MAX = 32
++_POSIX_HOST_NAME_MAX = 255
++_POSIX_LINK_MAX = 8
++_POSIX_LOGIN_NAME_MAX = 9
++_POSIX_MAX_CANON = 255
++_POSIX_MAX_INPUT = 255
++_POSIX_MQ_OPEN_MAX = 8
++_POSIX_MQ_PRIO_MAX = 32
++_POSIX_NAME_MAX = 14
++_POSIX_NGROUPS_MAX = 8
++_POSIX_NGROUPS_MAX = 0
++_POSIX_OPEN_MAX = 20
++_POSIX_OPEN_MAX = 16
++_POSIX_FD_SETSIZE = _POSIX_OPEN_MAX
++_POSIX_PATH_MAX = 256
++_POSIX_PIPE_BUF = 512
++_POSIX_RE_DUP_MAX = 255
++_POSIX_RTSIG_MAX = 8
++_POSIX_SEM_NSEMS_MAX = 256
++_POSIX_SEM_VALUE_MAX = 32767
++_POSIX_SIGQUEUE_MAX = 32
++_POSIX_SSIZE_MAX = 32767
++_POSIX_STREAM_MAX = 8
++_POSIX_SYMLINK_MAX = 255
++_POSIX_SYMLOOP_MAX = 8
++_POSIX_TIMER_MAX = 32
++_POSIX_TTY_NAME_MAX = 9
++_POSIX_TZNAME_MAX = 6
++_POSIX_QLIMIT = 1
++_POSIX_HIWAT = _POSIX_PIPE_BUF
++_POSIX_UIO_MAXIOV = 16
++_POSIX_CLOCKRES_MIN = 20000000
++
++# Included from bits/local_lim.h
++
++# Included from sys/syslimits.h
++ARG_MAX = 262144
++CHILD_MAX = 40
++LINK_MAX = 32767
++MAX_CANON = 255
++MAX_INPUT = 255
++NAME_MAX = 255
++NGROUPS_MAX = 1023
++OPEN_MAX = 64
++PATH_MAX = 1024
++PIPE_BUF = 512
++IOV_MAX = 1024
++_POSIX_THREAD_KEYS_MAX = 128
++PTHREAD_KEYS_MAX = 1024
++_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4
++PTHREAD_DESTRUCTOR_ITERATIONS = _POSIX_THREAD_DESTRUCTOR_ITERATIONS
++_POSIX_THREAD_THREADS_MAX = 64
++PTHREAD_THREADS_MAX = 1024
++AIO_PRIO_DELTA_MAX = 20
++PTHREAD_STACK_MIN = 16384
++TIMER_MAX = 256
++DELAYTIMER_MAX = 2147483647
++SSIZE_MAX = LONG_MAX
++NGROUPS_MAX = 8
++
++# Included from bits/posix2_lim.h
++_BITS_POSIX2_LIM_H = 1
++_POSIX2_BC_BASE_MAX = 99
++_POSIX2_BC_DIM_MAX = 2048
++_POSIX2_BC_SCALE_MAX = 99
++_POSIX2_BC_STRING_MAX = 1000
++_POSIX2_COLL_WEIGHTS_MAX = 2
++_POSIX2_EXPR_NEST_MAX = 32
++_POSIX2_LINE_MAX = 2048
++_POSIX2_RE_DUP_MAX = 255
++_POSIX2_CHARCLASS_NAME_MAX = 14
++BC_BASE_MAX = _POSIX2_BC_BASE_MAX
++BC_DIM_MAX = _POSIX2_BC_DIM_MAX
++BC_SCALE_MAX = _POSIX2_BC_SCALE_MAX
++BC_STRING_MAX = _POSIX2_BC_STRING_MAX
++COLL_WEIGHTS_MAX = 255
++EXPR_NEST_MAX = _POSIX2_EXPR_NEST_MAX
++LINE_MAX = _POSIX2_LINE_MAX
++CHARCLASS_NAME_MAX = 2048
++RE_DUP_MAX = (0x7fff)
++
++# Included from bits/xopen_lim.h
++_XOPEN_LIM_H = 1
++
++# Included from bits/stdio_lim.h
++L_tmpnam = 20
++TMP_MAX = 238328
++FILENAME_MAX = 1024
++L_ctermid = 9
++L_cuserid = 9
++FOPEN_MAX = 64
++IOV_MAX = 1024
++_XOPEN_IOV_MAX = _POSIX_UIO_MAXIOV
++NL_ARGMAX = _POSIX_ARG_MAX
++NL_LANGMAX = _POSIX2_LINE_MAX
++NL_MSGMAX = INT_MAX
++NL_NMAX = INT_MAX
++NL_SETMAX = INT_MAX
++NL_TEXTMAX = INT_MAX
++NZERO = 20
++WORD_BIT = 16
++WORD_BIT = 32
++WORD_BIT = 64
++WORD_BIT = 16
++WORD_BIT = 32
++WORD_BIT = 64
++WORD_BIT = 32
++LONG_BIT = 32
++LONG_BIT = 64
++LONG_BIT = 32
++LONG_BIT = 64
++LONG_BIT = 64
++LONG_BIT = 32
++
++# Included from bits/types.h
++_BITS_TYPES_H = 1
++__S32_TYPE = int
++__SWORD_TYPE = int
++__SLONG32_TYPE = int
++
++# Included from bits/typesizes.h
++_BITS_TYPESIZES_H = 1
++__PID_T_TYPE = __S32_TYPE
++__CLOCK_T_TYPE = __S32_TYPE
++__SWBLK_T_TYPE = __S32_TYPE
++__CLOCKID_T_TYPE = __S32_TYPE
++__TIMER_T_TYPE = __S32_TYPE
++__SSIZE_T_TYPE = __SWORD_TYPE
++__FD_SETSIZE = 1024
++PF_UNSPEC = 0
++PF_LOCAL = 1
++PF_UNIX = PF_LOCAL
++PF_FILE = PF_LOCAL
++PF_INET = 2
++PF_IMPLINK = 3
++PF_PUP = 4
++PF_CHAOS = 5
++PF_NS = 6
++PF_ISO = 7
++PF_OSI = PF_ISO
++PF_ECMA = 8
++PF_DATAKIT = 9
++PF_CCITT = 10
++PF_SNA = 11
++PF_DECnet = 12
++PF_DLI = 13
++PF_LAT = 14
++PF_HYLINK = 15
++PF_APPLETALK = 16
++PF_ROUTE = 17
++PF_LINK = 18
++PF_XTP = 19
++PF_COIP = 20
++PF_CNT = 21
++PF_RTIP = 22
++PF_IPX = 23
++PF_SIP = 24
++PF_PIP = 25
++PF_ISDN = 26
++PF_KEY = 27
++PF_INET6 = 28
++PF_NATM = 29
++PF_ATM = 30
++PF_HDRCMPLT = 31
++PF_NETGRAPH = 32
++PF_MAX = 33
++AF_UNSPEC = PF_UNSPEC
++AF_LOCAL = PF_LOCAL
++AF_UNIX = PF_UNIX
++AF_FILE = PF_FILE
++AF_INET = PF_INET
++AF_IMPLINK = PF_IMPLINK
++AF_PUP = PF_PUP
++AF_CHAOS = PF_CHAOS
++AF_NS = PF_NS
++AF_ISO = PF_ISO
++AF_OSI = PF_OSI
++AF_ECMA = PF_ECMA
++AF_DATAKIT = PF_DATAKIT
++AF_CCITT = PF_CCITT
++AF_SNA = PF_SNA
++AF_DECnet = PF_DECnet
++AF_DLI = PF_DLI
++AF_LAT = PF_LAT
++AF_HYLINK = PF_HYLINK
++AF_APPLETALK = PF_APPLETALK
++AF_ROUTE = PF_ROUTE
++AF_LINK = PF_LINK
++pseudo_AF_XTP = PF_XTP
++AF_COIP = PF_COIP
++AF_CNT = PF_CNT
++pseudo_AF_RTIP = PF_RTIP
++AF_IPX = PF_IPX
++AF_SIP = PF_SIP
++pseudo_AF_PIP = PF_PIP
++AF_ISDN = PF_ISDN
++AF_E164 = AF_ISDN
++pseudo_AF_KEY = PF_KEY
++AF_INET6 = PF_INET6
++AF_NATM = PF_NATM
++AF_ATM = PF_ATM
++pseudo_AF_HDRCMPLT = PF_HDRCMPLT
++AF_NETGRAPH = PF_NETGRAPH
++AF_MAX = PF_MAX
++SOMAXCONN = 128
++
++# Included from bits/sockaddr.h
++_BITS_SOCKADDR_H = 1
++def __SOCKADDR_COMMON(sa_prefix): return \
++
++_HAVE_SA_LEN = 1
++_SS_SIZE = 128
++def CMSG_FIRSTHDR(mhdr): return \
++
++CMGROUP_MAX = 16
++SOL_SOCKET = 0xffff
++LOCAL_PEERCRED = 0x001
++LOCAL_CREDS = 0x002
++LOCAL_CONNWAIT = 0x004
++
++# Included from bits/socket2.h
++def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0)
++
++IN_CLASSA_NET = (-16777216)
++IN_CLASSA_NSHIFT = 24
++IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET)
++IN_CLASSA_MAX = 128
++def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648))
++
++IN_CLASSB_NET = (-65536)
++IN_CLASSB_NSHIFT = 16
++IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET)
++IN_CLASSB_MAX = 65536
++def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824))
++
++IN_CLASSC_NET = (-256)
++IN_CLASSC_NSHIFT = 8
++IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET)
++def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912))
++
++def IN_MULTICAST(a): return IN_CLASSD(a)
++
++def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912))
++
++def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456))
++
++IN_LOOPBACKNET = 127
++INET_ADDRSTRLEN = 16
++INET6_ADDRSTRLEN = 46
++
++# Included from bits/in.h
++IMPLINK_IP = 155
++IMPLINK_LOWEXPER = 156
++IMPLINK_HIGHEXPER = 158
++IPPROTO_DIVERT = 258
++SOL_IP = 0
++IP_OPTIONS = 1
++IP_HDRINCL = 2
++IP_TOS = 3
++IP_TTL = 4
++IP_RECVOPTS = 5
++IP_RECVRETOPTS = 6
++IP_RECVDSTADDR = 7
++IP_SENDSRCADDR = IP_RECVDSTADDR
++IP_RETOPTS = 8
++IP_MULTICAST_IF = 9
++IP_MULTICAST_TTL = 10
++IP_MULTICAST_LOOP = 11
++IP_ADD_MEMBERSHIP = 12
++IP_DROP_MEMBERSHIP = 13
++IP_MULTICAST_VIF = 14
++IP_RSVP_ON = 15
++IP_RSVP_OFF = 16
++IP_RSVP_VIF_ON = 17
++IP_RSVP_VIF_OFF = 18
++IP_PORTRANGE = 19
++IP_RECVIF = 20
++IP_IPSEC_POLICY = 21
++IP_FAITH = 22
++IP_ONESBCAST = 23
++IP_NONLOCALOK = 24
++IP_FW_TABLE_ADD = 40
++IP_FW_TABLE_DEL = 41
++IP_FW_TABLE_FLUSH = 42
++IP_FW_TABLE_GETSIZE = 43
++IP_FW_TABLE_LIST = 44
++IP_FW_ADD = 50
++IP_FW_DEL = 51
++IP_FW_FLUSH = 52
++IP_FW_ZERO = 53
++IP_FW_GET = 54
++IP_FW_RESETLOG = 55
++IP_FW_NAT_CFG = 56
++IP_FW_NAT_DEL = 57
++IP_FW_NAT_GET_CONFIG = 58
++IP_FW_NAT_GET_LOG = 59
++IP_DUMMYNET_CONFIGURE = 60
++IP_DUMMYNET_DEL = 61
++IP_DUMMYNET_FLUSH = 62
++IP_DUMMYNET_GET = 64
++IP_RECVTTL = 65
++IP_MINTTL = 66
++IP_DONTFRAG = 67
++IP_ADD_SOURCE_MEMBERSHIP = 70
++IP_DROP_SOURCE_MEMBERSHIP = 71
++IP_BLOCK_SOURCE = 72
++IP_UNBLOCK_SOURCE = 73
++IP_MSFILTER = 74
++MCAST_JOIN_GROUP = 80
++MCAST_LEAVE_GROUP = 81
++MCAST_JOIN_SOURCE_GROUP = 82
++MCAST_LEAVE_SOURCE_GROUP = 83
++MCAST_BLOCK_SOURCE = 84
++MCAST_UNBLOCK_SOURCE = 85
++IP_DEFAULT_MULTICAST_TTL = 1
++IP_DEFAULT_MULTICAST_LOOP = 1
++IP_MIN_MEMBERSHIPS = 31
++IP_MAX_MEMBERSHIPS = 4095
++IP_MAX_SOURCE_FILTER = 1024
++MCAST_UNDEFINED = 0
++MCAST_INCLUDE = 1
++MCAST_EXCLUDE = 2
++IP_PORTRANGE_DEFAULT = 0
++IP_PORTRANGE_HIGH = 1
++IP_PORTRANGE_LOW = 2
++IPCTL_FORWARDING = 1
++IPCTL_SENDREDIRECTS = 2
++IPCTL_DEFTTL = 3
++IPCTL_DEFMTU = 4
++IPCTL_RTEXPIRE = 5
++IPCTL_RTMINEXPIRE = 6
++IPCTL_RTMAXCACHE = 7
++IPCTL_SOURCEROUTE = 8
++IPCTL_DIRECTEDBROADCAST = 9
++IPCTL_INTRQMAXLEN = 10
++IPCTL_INTRQDROPS = 11
++IPCTL_STATS = 12
++IPCTL_ACCEPTSOURCEROUTE = 13
++IPCTL_FASTFORWARDING = 14
++IPCTL_KEEPFAITH = 15
++IPCTL_GIF_TTL = 16
++IPCTL_MAXID = 17
++IPV6_SOCKOPT_RESERVED1 = 3
++IPV6_UNICAST_HOPS = 4
++IPV6_MULTICAST_IF = 9
++IPV6_MULTICAST_HOPS = 10
++IPV6_MULTICAST_LOOP = 11
++IPV6_JOIN_GROUP = 12
++IPV6_LEAVE_GROUP = 13
++IPV6_PORTRANGE = 14
++ICMP6_FILTER = 18
++IPV6_CHECKSUM = 26
++IPV6_V6ONLY = 27
++IPV6_IPSEC_POLICY = 28
++IPV6_FAITH = 29
++IPV6_FW_ADD = 30
++IPV6_FW_DEL = 31
++IPV6_FW_FLUSH = 32
++IPV6_FW_ZERO = 33
++IPV6_FW_GET = 34
++IPV6_RTHDRDSTOPTS = 35
++IPV6_RECVPKTINFO = 36
++IPV6_RECVHOPLIMIT = 37
++IPV6_RECVRTHDR = 38
++IPV6_RECVHOPOPTS = 39
++IPV6_RECVDSTOPTS = 40
++IPV6_USE_MIN_MTU = 42
++IPV6_RECVPATHMTU = 43
++IPV6_PATHMTU = 44
++IPV6_PKTINFO = 46
++IPV6_HOPLIMIT = 47
++IPV6_NEXTHOP = 48
++IPV6_HOPOPTS = 49
++IPV6_DSTOPTS = 50
++IPV6_RTHDR = 51
++IPV6_RECVTCLASS = 57
++IPV6_AUTOFLOWLABEL = 59
++IPV6_TCLASS = 61
++IPV6_DONTFRAG = 62
++IPV6_PREFER_TEMPADDR = 63
++IPV6_ADD_MEMBERSHIP = IPV6_JOIN_GROUP
++IPV6_DROP_MEMBERSHIP = IPV6_LEAVE_GROUP
++IPV6_RXHOPOPTS = IPV6_HOPOPTS
++IPV6_RXDSTOPTS = IPV6_DSTOPTS
++SOL_IPV6 = 41
++SOL_ICMPV6 = 58
++IPV6_DEFAULT_MULTICAST_HOPS = 1
++IPV6_DEFAULT_MULTICAST_LOOP = 1
++IPV6_PORTRANGE_DEFAULT = 0
++IPV6_PORTRANGE_HIGH = 1
++IPV6_PORTRANGE_LOW = 2
++IPV6_RTHDR_LOOSE = 0
++IPV6_RTHDR_STRICT = 1
++IPV6_RTHDR_TYPE_0 = 0
++IPV6CTL_FORWARDING = 1
++IPV6CTL_SENDREDIRECTS = 2
++IPV6CTL_DEFHLIM = 3
++IPV6CTL_FORWSRCRT = 5
++IPV6CTL_STATS = 6
++IPV6CTL_MRTSTATS = 7
++IPV6CTL_MRTPROTO = 8
++IPV6CTL_MAXFRAGPACKETS = 9
++IPV6CTL_SOURCECHECK = 10
++IPV6CTL_SOURCECHECK_LOGINT = 11
++IPV6CTL_ACCEPT_RTADV = 12
++IPV6CTL_KEEPFAITH = 13
++IPV6CTL_LOG_INTERVAL = 14
++IPV6CTL_HDRNESTLIMIT = 15
++IPV6CTL_DAD_COUNT = 16
++IPV6CTL_AUTO_FLOWLABEL = 17
++IPV6CTL_DEFMCASTHLIM = 18
++IPV6CTL_GIF_HLIM = 19
++IPV6CTL_KAME_VERSION = 20
++IPV6CTL_USE_DEPRECATED = 21
++IPV6CTL_RR_PRUNE = 22
++IPV6CTL_V6ONLY = 24
++IPV6CTL_RTEXPIRE = 25
++IPV6CTL_RTMINEXPIRE = 26
++IPV6CTL_RTMAXCACHE = 27
++IPV6CTL_USETEMPADDR = 32
++IPV6CTL_TEMPPLTIME = 33
++IPV6CTL_TEMPVLTIME = 34
++IPV6CTL_AUTO_LINKLOCAL = 35
++IPV6CTL_RIP6STATS = 36
++IPV6CTL_PREFER_TEMPADDR = 37
++IPV6CTL_ADDRCTLPOLICY = 38
++IPV6CTL_USE_DEFAULTZONE = 39
++IPV6CTL_MAXFRAGS = 41
++IPV6CTL_MCAST_PMTU = 44
++IPV6CTL_STEALTH = 45
++ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47
++IPV6CTL_MAXID = 48
++
++# Included from endian.h
++_ENDIAN_H = 1
++__LITTLE_ENDIAN = 1234
++__BIG_ENDIAN = 4321
++__PDP_ENDIAN = 3412
++
++# Included from bits/endian.h
++__BYTE_ORDER = __LITTLE_ENDIAN
++__FLOAT_WORD_ORDER = __BYTE_ORDER
++LITTLE_ENDIAN = __LITTLE_ENDIAN
++BIG_ENDIAN = __BIG_ENDIAN
++PDP_ENDIAN = __PDP_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++
++# Included from bits/byteswap.h
++_BITS_BYTESWAP_H = 1
++def __bswap_constant_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_constant_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_constant_64(x): return \
++
++def __bswap_64(x): return \
++
++def htobe16(x): return __bswap_16 (x)
++
++def htole16(x): return (x)
++
++def be16toh(x): return __bswap_16 (x)
++
++def le16toh(x): return (x)
++
++def htobe32(x): return __bswap_32 (x)
++
++def htole32(x): return (x)
++
++def be32toh(x): return __bswap_32 (x)
++
++def le32toh(x): return (x)
++
++def htobe64(x): return __bswap_64 (x)
++
++def htole64(x): return (x)
++
++def be64toh(x): return __bswap_64 (x)
++
++def le64toh(x): return (x)
++
++def htobe16(x): return (x)
++
++def htole16(x): return __bswap_16 (x)
++
++def be16toh(x): return (x)
++
++def le16toh(x): return __bswap_16 (x)
++
++def htobe32(x): return (x)
++
++def htole32(x): return __bswap_32 (x)
++
++def be32toh(x): return (x)
++
++def le32toh(x): return __bswap_32 (x)
++
++def htobe64(x): return (x)
++
++def htole64(x): return __bswap_64 (x)
++
++def be64toh(x): return (x)
++
++def le64toh(x): return __bswap_64 (x)
++
++def ntohl(x): return (x)
++
++def ntohs(x): return (x)
++
++def htonl(x): return (x)
++
++def htons(x): return (x)
++
++def ntohl(x): return __bswap_32 (x)
++
++def ntohs(x): return __bswap_16 (x)
++
++def htonl(x): return __bswap_32 (x)
++
++def htons(x): return __bswap_16 (x)
++
++def IN6_IS_ADDR_UNSPECIFIED(a): return \
++
++def IN6_IS_ADDR_LOOPBACK(a): return \
++
++def IN6_IS_ADDR_LINKLOCAL(a): return \
++
++def IN6_IS_ADDR_SITELOCAL(a): return \
++
++def IN6_IS_ADDR_V4MAPPED(a): return \
++
++def IN6_IS_ADDR_V4COMPAT(a): return \
++
++def IN6_IS_ADDR_MC_NODELOCAL(a): return \
++
++def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
++
++def IN6_IS_ADDR_MC_SITELOCAL(a): return \
++
++def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
++
++def IN6_IS_ADDR_MC_GLOBAL(a): return \
++
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd8/TYPES.py
+@@ -0,0 +1,303 @@
++# Generated by h2py from /usr/include/sys/types.h
++_SYS_TYPES_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from bits/types.h
++_BITS_TYPES_H = 1
++__S32_TYPE = int
++__SWORD_TYPE = int
++__SLONG32_TYPE = int
++
++# Included from bits/typesizes.h
++_BITS_TYPESIZES_H = 1
++__PID_T_TYPE = __S32_TYPE
++__CLOCK_T_TYPE = __S32_TYPE
++__SWBLK_T_TYPE = __S32_TYPE
++__CLOCKID_T_TYPE = __S32_TYPE
++__TIMER_T_TYPE = __S32_TYPE
++__SSIZE_T_TYPE = __SWORD_TYPE
++__FD_SETSIZE = 1024
++
++# Included from time.h
++_TIME_H = 1
++
++# Included from bits/time.h
++_BITS_TIME_H = 1
++CLOCKS_PER_SEC = 1000000l
++CLK_TCK = 128
++CLOCK_REALTIME = 0
++CLOCK_PROCESS_CPUTIME_ID = 2
++CLOCK_THREAD_CPUTIME_ID = 3
++CLOCK_MONOTONIC = 4
++CLOCK_VIRTUAL = 1
++CLOCK_PROF = 2
++CLOCK_UPTIME = 5
++CLOCK_UPTIME_PRECISE = 7
++CLOCK_UPTIME_FAST = 8
++CLOCK_REALTIME_PRECISE = 9
++CLOCK_REALTIME_FAST = 10
++CLOCK_MONOTONIC_PRECISE = 11
++CLOCK_MONOTONIC_FAST = 12
++CLOCK_SECOND = 13
++TIMER_RELTIME = 0
++TIMER_ABSTIME = 1
++_STRUCT_TIMEVAL = 1
++CLK_TCK = CLOCKS_PER_SEC
++__clock_t_defined = 1
++__time_t_defined = 1
++__clockid_t_defined = 1
++__timer_t_defined = 1
++__timespec_defined = 1
++
++# Included from xlocale.h
++_XLOCALE_H = 1
++def __isleap(year): return \
++
++__BIT_TYPES_DEFINED__ = 1
++
++# Included from endian.h
++_ENDIAN_H = 1
++__LITTLE_ENDIAN = 1234
++__BIG_ENDIAN = 4321
++__PDP_ENDIAN = 3412
++
++# Included from bits/endian.h
++__BYTE_ORDER = __LITTLE_ENDIAN
++__FLOAT_WORD_ORDER = __BYTE_ORDER
++LITTLE_ENDIAN = __LITTLE_ENDIAN
++BIG_ENDIAN = __BIG_ENDIAN
++PDP_ENDIAN = __PDP_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++
++# Included from bits/byteswap.h
++_BITS_BYTESWAP_H = 1
++def __bswap_constant_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_16(x): return \
++
++def __bswap_constant_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_32(x): return \
++
++def __bswap_constant_64(x): return \
++
++def __bswap_64(x): return \
++
++def htobe16(x): return __bswap_16 (x)
++
++def htole16(x): return (x)
++
++def be16toh(x): return __bswap_16 (x)
++
++def le16toh(x): return (x)
++
++def htobe32(x): return __bswap_32 (x)
++
++def htole32(x): return (x)
++
++def be32toh(x): return __bswap_32 (x)
++
++def le32toh(x): return (x)
++
++def htobe64(x): return __bswap_64 (x)
++
++def htole64(x): return (x)
++
++def be64toh(x): return __bswap_64 (x)
++
++def le64toh(x): return (x)
++
++def htobe16(x): return (x)
++
++def htole16(x): return __bswap_16 (x)
++
++def be16toh(x): return (x)
++
++def le16toh(x): return __bswap_16 (x)
++
++def htobe32(x): return (x)
++
++def htole32(x): return __bswap_32 (x)
++
++def be32toh(x): return (x)
++
++def le32toh(x): return __bswap_32 (x)
++
++def htobe64(x): return (x)
++
++def htole64(x): return __bswap_64 (x)
++
++def be64toh(x): return (x)
++
++def le64toh(x): return __bswap_64 (x)
++
++
++# Included from sys/select.h
++_SYS_SELECT_H = 1
++
++# Included from bits/select.h
++def __FD_ZERO(fdsp): return \
++
++def __FD_ZERO(set): return \
++
++
++# Included from bits/sigset.h
++_SIGSET_H_types = 1
++_SIGSET_H_fns = 1
++def __sigword(sig): return (((sig) - 1) >> 5)
++
++def __sigemptyset(set): return \
++
++def __sigfillset(set): return \
++
++def __sigisemptyset(set): return \
++
++def __FDELT(d): return ((d) / __NFDBITS)
++
++FD_SETSIZE = __FD_SETSIZE
++def FD_ZERO(fdsetp): return __FD_ZERO (fdsetp)
++
++
++# Included from sys/sysmacros.h
++_SYS_SYSMACROS_H = 1
++def minor(dev): return ((int)((dev) & (-65281)))
++
++def gnu_dev_major(dev): return major (dev)
++
++def gnu_dev_minor(dev): return minor (dev)
++
++
++# Included from bits/pthreadtypes.h
++_BITS_PTHREADTYPES_H = 1
++
++# Included from bits/sched.h
++SCHED_OTHER = 2
++SCHED_FIFO = 1
++SCHED_RR = 3
++CSIGNAL = 0x000000ff
++CLONE_VM = 0x00000100
++CLONE_FS = 0x00000200
++CLONE_FILES = 0x00000400
++CLONE_SIGHAND = 0x00000800
++CLONE_PTRACE = 0x00002000
++CLONE_VFORK = 0x00004000
++CLONE_SYSVSEM = 0x00040000
++__defined_schedparam = 1
++__CPU_SETSIZE = 128
++def __CPUELT(cpu): return ((cpu) / __NCPUBITS)
++
++def __CPU_ALLOC_SIZE(count): return \
++
++def __CPU_ALLOC(count): return __sched_cpualloc (count)
++
++def __CPU_FREE(cpuset): return __sched_cpufree (cpuset)
++
+--- /dev/null
++++ b/Lib/plat-gnukfreebsd8/DLFCN.py
+@@ -0,0 +1,118 @@
++# Generated by h2py from /usr/include/dlfcn.h
++_DLFCN_H = 1
++
++# Included from features.h
++_FEATURES_H = 1
++__USE_ANSI = 1
++__FAVOR_BSD = 1
++_ISOC99_SOURCE = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 200809L
++_XOPEN_SOURCE = 700
++_XOPEN_SOURCE_EXTENDED = 1
++_LARGEFILE64_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++_ATFILE_SOURCE = 1
++_BSD_SOURCE = 1
++_SVID_SOURCE = 1
++__USE_ISOC99 = 1
++__USE_ISOC95 = 1
++_POSIX_SOURCE = 1
++_POSIX_C_SOURCE = 2
++_POSIX_C_SOURCE = 199506L
++_POSIX_C_SOURCE = 200112L
++_POSIX_C_SOURCE = 200809L
++__USE_POSIX_IMPLICITLY = 1
++__USE_POSIX = 1
++__USE_POSIX2 = 1
++__USE_POSIX199309 = 1
++__USE_POSIX199506 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN2K8 = 1
++_ATFILE_SOURCE = 1
++__USE_XOPEN = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_UNIX98 = 1
++_LARGEFILE_SOURCE = 1
++__USE_XOPEN2K8 = 1
++__USE_XOPEN2K = 1
++__USE_ISOC99 = 1
++__USE_XOPEN_EXTENDED = 1
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_FILE_OFFSET64 = 1
++__USE_MISC = 1
++__USE_BSD = 1
++__USE_SVID = 1
++__USE_ATFILE = 1
++__USE_GNU = 1
++__USE_REENTRANT = 1
++__USE_FORTIFY_LEVEL = 2
++__USE_FORTIFY_LEVEL = 1
++__USE_FORTIFY_LEVEL = 0
++
++# Included from bits/predefs.h
++__STDC_IEC_559__ = 1
++__STDC_IEC_559_COMPLEX__ = 1
++__STDC_ISO_10646__ = 200009L
++__GNU_LIBRARY__ = 6
++__GLIBC__ = 2
++__GLIBC_MINOR__ = 11
++__GLIBC_HAVE_LONG_LONG = 1
++
++# Included from sys/cdefs.h
++_SYS_CDEFS_H = 1
++def __NTH(fct): return fct
++
++def __NTH(fct): return fct
++
++def __P(args): return args
++
++def __PMT(args): return args
++
++def __STRING(x): return #x
++
++def __bos(ptr): return __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
++
++def __bos0(ptr): return __builtin_object_size (ptr, 0)
++
++def __warnattr(msg): return __attribute__((__warning__ (msg)))
++
++__flexarr = []
++__flexarr = [0]
++__flexarr = []
++__flexarr = [1]
++def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
++
++def __attribute__(xyz): return  
++
++def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x)))
++
++def __attribute_format_arg__(x): return  
++
++
++# Included from bits/wordsize.h
++__WORDSIZE = 32
++__LDBL_COMPAT = 1
++def __LDBL_REDIR_DECL(name): return \
++
++__USE_LARGEFILE = 1
++__USE_LARGEFILE64 = 1
++__USE_EXTERN_INLINES = 1
++__USE_EXTERN_INLINES_IN_LIBC = 1
++
++# Included from gnu/stubs.h
++
++# Included from bits/dlfcn.h
++RTLD_LAZY = 0x00001
++RTLD_NOW = 0x00002
++RTLD_BINDING_MASK = 0x3
++RTLD_NOLOAD = 0x00004
++RTLD_DEEPBIND = 0x00008
++RTLD_GLOBAL = 0x00100
++RTLD_LOCAL = 0
++RTLD_NODELETE = 0x01000
++LM_ID_BASE = 0
++LM_ID_NEWLM = -1
--- python2.7-2.7.12.orig/debian/patches/plat-linux2_alpha.diff
+++ python2.7-2.7.12/debian/patches/plat-linux2_alpha.diff
@@ -0,0 +1,73 @@
+Index: Lib/plat-linux2/IN.py
+===================================================================
+--- ./Lib/plat-linux2/IN.py	(Revision 77754)
++++ ./Lib/plat-linux2/IN.py	(Arbeitskopie)
+@@ -436,43 +436,43 @@
+ # Included from asm/socket.h
+ 
+ # Included from asm/sockios.h
+-FIOSETOWN = 0x8901
+-SIOCSPGRP = 0x8902
+-FIOGETOWN = 0x8903
+-SIOCGPGRP = 0x8904
+-SIOCATMARK = 0x8905
++FIOSETOWN = 0x8004667c
++SIOCSPGRP = 0x80047308
++FIOGETOWN = 0x4004667b
++SIOCGPGRP = 0x40047309
++SIOCATMARK = 0x40047307
+ SIOCGSTAMP = 0x8906
+-SOL_SOCKET = 1
+-SO_DEBUG = 1
+-SO_REUSEADDR = 2
+-SO_TYPE = 3
+-SO_ERROR = 4
+-SO_DONTROUTE = 5
+-SO_BROADCAST = 6
+-SO_SNDBUF = 7
+-SO_RCVBUF = 8
+-SO_KEEPALIVE = 9
+-SO_OOBINLINE = 10
++SOL_SOCKET = 0xffff
++SO_DEBUG = 0x0001
++SO_REUSEADDR = 0x0004
++SO_TYPE = 0x1008
++SO_ERROR = 0x1007
++SO_DONTROUTE = 0x0010
++SO_BROADCAST = 0x0020
++SO_SNDBUF = 0x1001
++SO_RCVBUF = 0x1002
++SO_KEEPALIVE = 0x0008
++SO_OOBINLINE = 0x0100
+ SO_NO_CHECK = 11
+ SO_PRIORITY = 12
+-SO_LINGER = 13
++SO_LINGER = 0x0080
+ SO_BSDCOMPAT = 14
+ SO_PASSCRED = 16
+ SO_PEERCRED = 17
+-SO_RCVLOWAT = 18
+-SO_SNDLOWAT = 19
+-SO_RCVTIMEO = 20
+-SO_SNDTIMEO = 21
+-SO_SECURITY_AUTHENTICATION = 22
+-SO_SECURITY_ENCRYPTION_TRANSPORT = 23
+-SO_SECURITY_ENCRYPTION_NETWORK = 24
++SO_RCVLOWAT = 0x1010
++SO_SNDLOWAT = 0x1011
++SO_RCVTIMEO = 0x1012
++SO_SNDTIMEO = 0x1013
++SO_SECURITY_AUTHENTICATION = 19
++SO_SECURITY_ENCRYPTION_TRANSPORT = 20
++SO_SECURITY_ENCRYPTION_NETWORK = 21
+ SO_BINDTODEVICE = 25
+ SO_ATTACH_FILTER = 26
+ SO_DETACH_FILTER = 27
+ SO_PEERNAME = 28
+ SO_TIMESTAMP = 29
+ SCM_TIMESTAMP = SO_TIMESTAMP
+-SO_ACCEPTCONN = 30
++SO_ACCEPTCONN = 0x1014
+ SOCK_STREAM = 1
+ SOCK_DGRAM = 2
+ SOCK_RAW = 3
--- python2.7-2.7.12.orig/debian/patches/plat-linux2_hppa.diff
+++ python2.7-2.7.12/debian/patches/plat-linux2_hppa.diff
@@ -0,0 +1,72 @@
+Index: Lib/plat-linux2/IN.py
+===================================================================
+--- ./Lib/plat-linux2/IN.py	(Revision 77754)
++++ ./Lib/plat-linux2/IN.py	(Arbeitskopie)
+@@ -442,37 +442,37 @@
+ SIOCGPGRP = 0x8904
+ SIOCATMARK = 0x8905
+ SIOCGSTAMP = 0x8906
+-SOL_SOCKET = 1
+-SO_DEBUG = 1
+-SO_REUSEADDR = 2
+-SO_TYPE = 3
+-SO_ERROR = 4
+-SO_DONTROUTE = 5
+-SO_BROADCAST = 6
+-SO_SNDBUF = 7
+-SO_RCVBUF = 8
+-SO_KEEPALIVE = 9
+-SO_OOBINLINE = 10
+-SO_NO_CHECK = 11
+-SO_PRIORITY = 12
+-SO_LINGER = 13
+-SO_BSDCOMPAT = 14
+-SO_PASSCRED = 16
+-SO_PEERCRED = 17
+-SO_RCVLOWAT = 18
+-SO_SNDLOWAT = 19
+-SO_RCVTIMEO = 20
+-SO_SNDTIMEO = 21
+-SO_SECURITY_AUTHENTICATION = 22
+-SO_SECURITY_ENCRYPTION_TRANSPORT = 23
+-SO_SECURITY_ENCRYPTION_NETWORK = 24
+-SO_BINDTODEVICE = 25
+-SO_ATTACH_FILTER = 26
+-SO_DETACH_FILTER = 27
+-SO_PEERNAME = 28
+-SO_TIMESTAMP = 29
++SOL_SOCKET = 0xffff
++SO_DEBUG = 0x0001
++SO_REUSEADDR = 0x0004
++SO_TYPE = 0x1008
++SO_ERROR = 0x1007
++SO_DONTROUTE = 0x0010
++SO_BROADCAST = 0x0020
++SO_SNDBUF = 0x1001
++SO_RCVBUF = 0x1002
++SO_KEEPALIVE = 0x0008
++SO_OOBINLINE = 0x0100
++SO_NO_CHECK = 0x400b
++SO_PRIORITY = 0x400c
++SO_LINGER = 0x0080
++SO_BSDCOMPAT = 0x400e
++SO_PASSCRED = 0x4010
++SO_PEERCRED = 0x4011
++SO_RCVLOWAT = 0x1004
++SO_SNDLOWAT = 0x1003
++SO_RCVTIMEO = 0x1006
++SO_SNDTIMEO = 0x1005
++SO_SECURITY_AUTHENTICATION = 0x4016
++SO_SECURITY_ENCRYPTION_TRANSPORT = 0x4017
++SO_SECURITY_ENCRYPTION_NETWORK = 0x4018
++SO_BINDTODEVICE = 0x4019
++SO_ATTACH_FILTER = 0x401a
++SO_DETACH_FILTER = 0x401b
++SO_PEERNAME = 0x2000
++SO_TIMESTAMP = 0x4012
+ SCM_TIMESTAMP = SO_TIMESTAMP
+-SO_ACCEPTCONN = 30
++SO_ACCEPTCONN = 0x401c
+ SOCK_STREAM = 1
+ SOCK_DGRAM = 2
+ SOCK_RAW = 3
--- python2.7-2.7.12.orig/debian/patches/plat-linux2_mips.diff
+++ python2.7-2.7.12/debian/patches/plat-linux2_mips.diff
@@ -0,0 +1,88 @@
+Index: Lib/plat-linux2/DLFCN.py
+===================================================================
+--- ./Lib/plat-linux2/DLFCN.py	(Revision 77754)
++++ ./Lib/plat-linux2/DLFCN.py	(Arbeitskopie)
+@@ -77,7 +77,7 @@
+ RTLD_LAZY = 0x00001
+ RTLD_NOW = 0x00002
+ RTLD_BINDING_MASK = 0x3
+-RTLD_NOLOAD = 0x00004
+-RTLD_GLOBAL = 0x00100
++RTLD_NOLOAD = 0x00008
++RTLD_GLOBAL = 0x00004
+ RTLD_LOCAL = 0
+ RTLD_NODELETE = 0x01000
+Index: Lib/plat-linux2/IN.py
+===================================================================
+--- ./Lib/plat-linux2/IN.py	(Revision 77754)
++++ ./Lib/plat-linux2/IN.py	(Arbeitskopie)
+@@ -436,33 +436,33 @@
+ # Included from asm/socket.h
+ 
+ # Included from asm/sockios.h
+-FIOSETOWN = 0x8901
+-SIOCSPGRP = 0x8902
+-FIOGETOWN = 0x8903
+-SIOCGPGRP = 0x8904
+-SIOCATMARK = 0x8905
++FIOSETOWN = 0x8004667c
++SIOCSPGRP = 0x80047308
++FIOGETOWN = 0x4004667b
++SIOCGPGRP = 0x40047309
++SIOCATMARK = 0x40047307
+ SIOCGSTAMP = 0x8906
+-SOL_SOCKET = 1
+-SO_DEBUG = 1
+-SO_REUSEADDR = 2
+-SO_TYPE = 3
+-SO_ERROR = 4
+-SO_DONTROUTE = 5
+-SO_BROADCAST = 6
+-SO_SNDBUF = 7
+-SO_RCVBUF = 8
+-SO_KEEPALIVE = 9
+-SO_OOBINLINE = 10
++SOL_SOCKET = 0xffff
++SO_DEBUG = 0x0001
++SO_REUSEADDR = 0x0004
++SO_TYPE = 0x1008
++SO_ERROR = 0x1007
++SO_DONTROUTE = 0x0010
++SO_BROADCAST = 0x0020
++SO_SNDBUF = 0x1001
++SO_RCVBUF = 0x1002
++SO_KEEPALIVE = 0x0008
++SO_OOBINLINE = 0x0100
+ SO_NO_CHECK = 11
+ SO_PRIORITY = 12
+-SO_LINGER = 13
++SO_LINGER = 0x0080
+ SO_BSDCOMPAT = 14
+-SO_PASSCRED = 16
+-SO_PEERCRED = 17
+-SO_RCVLOWAT = 18
+-SO_SNDLOWAT = 19
+-SO_RCVTIMEO = 20
+-SO_SNDTIMEO = 21
++SO_PASSCRED = 17
++SO_PEERCRED = 18
++SO_RCVLOWAT = 0x1004
++SO_SNDLOWAT = 0x1003
++SO_RCVTIMEO = 0x1006
++SO_SNDTIMEO = 0x1005
+ SO_SECURITY_AUTHENTICATION = 22
+ SO_SECURITY_ENCRYPTION_TRANSPORT = 23
+ SO_SECURITY_ENCRYPTION_NETWORK = 24
+@@ -472,9 +472,9 @@
+ SO_PEERNAME = 28
+ SO_TIMESTAMP = 29
+ SCM_TIMESTAMP = SO_TIMESTAMP
+-SO_ACCEPTCONN = 30
+-SOCK_STREAM = 1
+-SOCK_DGRAM = 2
++SO_ACCEPTCONN = 0x1009
++SOCK_STREAM = 2
++SOCK_DGRAM = 1
+ SOCK_RAW = 3
+ SOCK_RDM = 4
+ SOCK_SEQPACKET = 5
--- python2.7-2.7.12.orig/debian/patches/plat-linux2_sparc.diff
+++ python2.7-2.7.12/debian/patches/plat-linux2_sparc.diff
@@ -0,0 +1,72 @@
+Index: Lib/plat-linux2/IN.py
+===================================================================
+--- ./Lib/plat-linux2/IN.py	(Revision 77754)
++++ ./Lib/plat-linux2/IN.py	(Arbeitskopie)
+@@ -442,37 +442,37 @@
+ SIOCGPGRP = 0x8904
+ SIOCATMARK = 0x8905
+ SIOCGSTAMP = 0x8906
+-SOL_SOCKET = 1
+-SO_DEBUG = 1
+-SO_REUSEADDR = 2
+-SO_TYPE = 3
+-SO_ERROR = 4
+-SO_DONTROUTE = 5
+-SO_BROADCAST = 6
+-SO_SNDBUF = 7
+-SO_RCVBUF = 8
+-SO_KEEPALIVE = 9
+-SO_OOBINLINE = 10
+-SO_NO_CHECK = 11
+-SO_PRIORITY = 12
+-SO_LINGER = 13
+-SO_BSDCOMPAT = 14
+-SO_PASSCRED = 16
+-SO_PEERCRED = 17
+-SO_RCVLOWAT = 18
+-SO_SNDLOWAT = 19
+-SO_RCVTIMEO = 20
+-SO_SNDTIMEO = 21
+-SO_SECURITY_AUTHENTICATION = 22
+-SO_SECURITY_ENCRYPTION_TRANSPORT = 23
+-SO_SECURITY_ENCRYPTION_NETWORK = 24
+-SO_BINDTODEVICE = 25
+-SO_ATTACH_FILTER = 26
+-SO_DETACH_FILTER = 27
+-SO_PEERNAME = 28
+-SO_TIMESTAMP = 29
++SOL_SOCKET = 0xffff
++SO_DEBUG = 0x0001
++SO_REUSEADDR = 0x0004
++SO_TYPE = 0x1008
++SO_ERROR = 0x1007
++SO_DONTROUTE = 0x0010
++SO_BROADCAST = 0x0020
++SO_SNDBUF = 0x1001
++SO_RCVBUF = 0x1002
++SO_KEEPALIVE = 0x0008
++SO_OOBINLINE = 0x0100
++SO_NO_CHECK = 0x000b
++SO_PRIORITY = 0x000c
++SO_LINGER = 0x0080
++SO_BSDCOMPAT = 0x0400
++SO_PASSCRED = 0x0002
++SO_PEERCRED = 0x0040
++SO_RCVLOWAT = 0x0800
++SO_SNDLOWAT = 0x1000
++SO_RCVTIMEO = 0x2000
++SO_SNDTIMEO = 0x4000
++SO_SECURITY_AUTHENTICATION = 0x5001
++SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002
++SO_SECURITY_ENCRYPTION_NETWORK = 0x5004
++SO_BINDTODEVICE = 0x000d
++SO_ATTACH_FILTER = 0x001a
++SO_DETACH_FILTER = 0x001b
++SO_PEERNAME = 0x001c
++SO_TIMESTAMP = 0x001d
+ SCM_TIMESTAMP = SO_TIMESTAMP
+-SO_ACCEPTCONN = 30
++SO_ACCEPTCONN = 0x8000
+ SOCK_STREAM = 1
+ SOCK_DGRAM = 2
+ SOCK_RAW = 3
--- python2.7-2.7.12.orig/debian/patches/platform-lsbrelease.diff
+++ python2.7-2.7.12/debian/patches/platform-lsbrelease.diff
@@ -0,0 +1,52 @@
+# DP: Use /etc/lsb-release to identify the platform.
+
+Index: b/Lib/platform.py
+===================================================================
+--- a/Lib/platform.py
++++ b/Lib/platform.py
+@@ -261,7 +261,7 @@ _release_version = re.compile(r'([^0-9]+
+ _supported_dists = (
+     'SuSE', 'debian', 'fedora', 'redhat', 'centos',
+     'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
+-    'UnitedLinux', 'turbolinux')
++    'UnitedLinux', 'turbolinux', 'Ubuntu')
+ 
+ def _parse_release_file(firstline):
+ 
+@@ -290,6 +290,10 @@ def _parse_release_file(firstline):
+             id = l[1]
+     return '', version, id
+ 
++_distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I)
++_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I)
++_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I)
++
+ def linux_distribution(distname='', version='', id='',
+ 
+                        supported_dists=_supported_dists,
+@@ -314,6 +318,25 @@ def linux_distribution(distname='', vers
+         args given as parameters.
+ 
+     """
++    # check for the LSB /etc/lsb-release file first, needed so
++    # that the distribution doesn't get identified as Debian.
++    try:
++        with open("/etc/lsb-release", "rU") as etclsbrel:
++            for line in etclsbrel:
++                m = _distributor_id_file_re.search(line)
++                if m:
++                    _u_distname = m.group(1).strip()
++                m = _release_file_re.search(line)
++                if m:
++                    _u_version = m.group(1).strip()
++                m = _codename_file_re.search(line)
++                if m:
++                    _u_id = m.group(1).strip()
++            if _u_distname and _u_version:
++                return (_u_distname, _u_version, _u_id)
++    except (EnvironmentError, UnboundLocalError):
++        pass
++
+     try:
+         etc = os.listdir('/etc')
+     except os.error:
--- python2.7-2.7.12.orig/debian/patches/profiled-build.diff
+++ python2.7-2.7.12/debian/patches/profiled-build.diff
@@ -0,0 +1,15 @@
+# DP: Fix profiled build; don't use Python/thread.gc*, gcc complains
+
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -465,7 +465,7 @@ build_all_generate_profile:
+ 
+ run_profile_task:
+ 	: # FIXME: can't run for a cross build
+-	$(LLVM_PROF_FILE) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
++	-$(LLVM_PROF_FILE) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
+ 
+ build_all_merge_profile:
+ 	$(LLVM_PROF_MERGER)
--- python2.7-2.7.12.orig/debian/patches/pydoc-use-pager.diff
+++ python2.7-2.7.12/debian/patches/pydoc-use-pager.diff
@@ -0,0 +1,15 @@
+# DP: pydoc: use the pager command if available.
+
+Index: b/Lib/pydoc.py
+===================================================================
+--- a/Lib/pydoc.py
++++ b/Lib/pydoc.py
+@@ -1394,6 +1394,8 @@ def getpager():
+         return plainpager
+     if sys.platform == 'win32' or sys.platform.startswith('os2'):
+         return lambda text: tempfilepager(plain(text), 'more <')
++    if hasattr(os, 'system') and os.system('(pager) 2>/dev/null') == 0:
++        return lambda text: pipepager(text, 'pager')
+     if hasattr(os, 'system') and os.system('(less) 2>/dev/null') == 0:
+         return lambda text: pipepager(text, 'less')
+ 
--- python2.7-2.7.12.orig/debian/patches/reproducible-buildinfo.diff
+++ python2.7-2.7.12/debian/patches/reproducible-buildinfo.diff
@@ -0,0 +1,15 @@
+# DP: Build getbuildinfo.o with DATE/TIME values when defined
+
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -676,6 +676,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+ 	      -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
+ 	      -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
+ 	      -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
++	      $(if $(BUILD_DATE),-DDATE='"$(BUILD_DATE)"') \
++	      $(if $(BUILD_TIME),-DTIME='"$(BUILD_TIME)"') \
+ 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
+ 
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
--- python2.7-2.7.12.orig/debian/patches/revert-unittest-loader-symlinks19352.diff
+++ python2.7-2.7.12/debian/patches/revert-unittest-loader-symlinks19352.diff
@@ -0,0 +1,68 @@
+Description: DP: Revert patch from http://bugs.python.org/issue19352 as it completely breaks unittest discovery on Debian/Ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1255505
+
+Index: b/Lib/unittest/loader.py
+===================================================================
+--- a/Lib/unittest/loader.py
++++ b/Lib/unittest/loader.py
+@@ -256,8 +256,8 @@ class TestLoader(object):
+                     yield _make_failed_import_test(name, self.suiteClass)
+                 else:
+                     mod_file = os.path.abspath(getattr(module, '__file__', full_path))
+-                    realpath = os.path.splitext(os.path.realpath(mod_file))[0]
+-                    fullpath_noext = os.path.splitext(os.path.realpath(full_path))[0]
++                    realpath = os.path.splitext(mod_file)[0]
++                    fullpath_noext = os.path.splitext(full_path)[0]
+                     if realpath.lower() != fullpath_noext.lower():
+                         module_dir = os.path.dirname(realpath)
+                         mod_name = os.path.splitext(os.path.basename(full_path))[0]
+Index: b/Lib/unittest/test/test_discovery.py
+===================================================================
+--- a/Lib/unittest/test/test_discovery.py
++++ b/Lib/unittest/test/test_discovery.py
+@@ -315,7 +315,7 @@ class TestDiscovery(unittest.TestCase):
+         self.assertTrue(program.failfast)
+         self.assertTrue(program.catchbreak)
+ 
+-    def setup_module_clash(self):
++    def test_detect_module_clash(self):
+         class Module(object):
+             __file__ = 'bar/foo.py'
+         sys.modules['foo'] = Module
+@@ -342,10 +342,7 @@ class TestDiscovery(unittest.TestCase):
+         os.listdir = listdir
+         os.path.isfile = isfile
+         os.path.isdir = isdir
+-        return full_path
+ 
+-    def test_detect_module_clash(self):
+-        full_path = self.setup_module_clash()
+         loader = unittest.TestLoader()
+ 
+         mod_dir = os.path.abspath('bar')
+@@ -358,25 +355,6 @@ class TestDiscovery(unittest.TestCase):
+         )
+         self.assertEqual(sys.path[0], full_path)
+ 
+-    def test_module_symlink_ok(self):
+-        full_path = self.setup_module_clash()
+-
+-        original_realpath = os.path.realpath
+-
+-        mod_dir = os.path.abspath('bar')
+-        expected_dir = os.path.abspath('foo')
+-
+-        def cleanup():
+-            os.path.realpath = original_realpath
+-        self.addCleanup(cleanup)
+-
+-        def realpath(path):
+-            if path == os.path.join(mod_dir, 'foo.py'):
+-                return os.path.join(expected_dir, 'foo.py')
+-            return path
+-        os.path.realpath = realpath
+-        loader = unittest.TestLoader()
+-        loader.discover(start_dir='foo', pattern='foo.py')
+ 
+     def test_discovery_from_dotted_path(self):
+         loader = unittest.TestLoader()
--- python2.7-2.7.12.orig/debian/patches/series.in
+++ python2.7-2.7.12/debian/patches/series.in
@@ -0,0 +1,71 @@
+hg-updates.diff
+issue9189.diff
+build-libpython.diff
+deb-setup.diff
+deb-locations.diff
+site-locations.diff
+distutils-install-layout.diff
+locale-module.diff
+distutils-link.diff
+distutils-sysconfig.diff
+test-sundry.diff
+tkinter-import.diff
+link-opt.diff
+debug-build.diff
+hotshot-import.diff
+profiled-build.diff
+no-zip-on-sys.path.diff
+platform-lsbrelease.diff
+bdist-wininst-notfound.diff
+setup-modules-ssl.diff
+makesetup-bashism.diff
+hurd-disable-nonworking-constants.diff
+#ifdef WITH_FPECTL
+enable-fpectl.diff
+#endif
+statvfs-f_flag-constants.diff
+#if defined (arch_alpha)
+plat-linux2_alpha.diff
+#elif defined (arch_hppa)
+plat-linux2_hppa.diff
+#elif defined (arch_mips) || defined(arch_mipsel) || defined (arch_mips64) || defined(arch_mips64el)
+plat-linux2_mips.diff
+#elif defined (arch_sparc) || defined (arch_sparc64)
+plat-linux2_sparc.diff
+#endif
+#if defined (BROKEN_UTIMES)
+disable-utimes.diff
+#endif
+#if defined (Ubuntu)
+langpack-gettext.diff
+#endif
+#if defined (arch_os_hurd)
+no-large-file-support.diff
+cthreads.diff
+#endif
+issue9012a.diff
+link-system-expat.diff
+plat-gnukfreebsd.diff
+link-whole-archive.diff
+bsddb-libpath.diff
+disable-sem-check.diff
+ctypes-arm.diff
+lto-link-flags.diff
+multiarch.diff
+lib2to3-no-pickled-grammar.diff
+add-python-config-sh.diff
+ext-no-libpython-link.diff
+build-hash.diff
+libffi-shared.diff
+atomic-pyc-rename.diff
+revert-unittest-loader-symlinks19352.diff
+enable-sqlite-loadext.diff
+installed-testsuite.diff
+ensurepip-wheels.diff
+ensurepip-disabled.diff
+mangle-fstack-protector.diff
+reproducible-buildinfo.diff
+pydoc-use-pager.diff
+fix-sslv3-test.diff
+idle-tk8.6.diff
+issue27239.diff
--- python2.7-2.7.12.orig/debian/patches/setup-modules-ssl.diff
+++ python2.7-2.7.12/debian/patches/setup-modules-ssl.diff
@@ -0,0 +1,24 @@
+# DP: Modules/Setup.dist: patch to build _hashlib and _ssl extensions statically
+
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -215,10 +215,7 @@
+ 
+ # Socket module helper for SSL support; you must comment out the other
+ # socket line above, and possibly edit the SSL variable:
+-#SSL=/usr/local/ssl
+-#_ssl _ssl.c \
+-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+-#	-L$(SSL)/lib -lssl -lcrypto
++#_ssl _ssl.c -lssl -lcrypto
+ 
+ # The crypt module is now disabled by default because it breaks builds
+ # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
+@@ -261,6 +258,7 @@
+ #_sha256 sha256module.c
+ #_sha512 sha512module.c
+ 
++#_hashlib _hashopenssl.c -lssl -lcrypto
+ 
+ # SGI IRIX specific modules -- off by default.
+ 
--- python2.7-2.7.12.orig/debian/patches/site-locations.diff
+++ python2.7-2.7.12/debian/patches/site-locations.diff
@@ -0,0 +1,32 @@
+# DP: Set site-packages/dist-packages
+
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -19,6 +19,12 @@
+ resulting directories, if they exist, are appended to sys.path, and
+ also inspected for path configuration files.
+ 
++For Debian and derivatives, this sys.path is augmented with directories
++for packages distributed within the distribution. Local addons go
++into /usr/local/lib/python/dist-packages, Debian addons
++install into /usr/{lib,share}/python/dist-packages.
++/usr/lib/python/site-packages is not used.
++
+ A path configuration file is a file whose name has the form
+ .pth; its contents are additional directories (one per line)
+ to be added to sys.path.  Non-existing directories (or
+@@ -288,10 +294,12 @@
+         if sys.platform in ('os2emx', 'riscos'):
+             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+         elif os.sep == '/':
++            sitepackages.append(os.path.join(prefix, "local/lib",
++                                        "python" + sys.version[:3],
++                                        "dist-packages"))
+             sitepackages.append(os.path.join(prefix, "lib",
+                                         "python" + sys.version[:3],
+-                                        "site-packages"))
+-            sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++                                        "dist-packages"))
+         else:
+             sitepackages.append(prefix)
+             sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
--- python2.7-2.7.12.orig/debian/patches/sphinx-no-refcounting.diff
+++ python2.7-2.7.12/debian/patches/sphinx-no-refcounting.diff
@@ -0,0 +1,15 @@
+# DP: Use the included sphinx refcounting extension.
+
+Index: b/Doc/conf.py
+===================================================================
+--- a/Doc/conf.py
++++ b/Doc/conf.py
+@@ -13,7 +13,7 @@
+ # General configuration
+ # ---------------------
+ 
+-extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage',
++extensions = ['sphinx.ext.coverage',
+               'sphinx.ext.doctest', 'pyspecific']
+ templates_path = ['tools/sphinxext']
+ 
--- python2.7-2.7.12.orig/debian/patches/statvfs-f_flag-constants.diff
+++ python2.7-2.7.12/debian/patches/statvfs-f_flag-constants.diff
@@ -0,0 +1,59 @@
+From 21fda4c78000d78cb1824fdf0373031d07f5325a Mon Sep 17 00:00:00 2001
+From: Peter Jones 
+Date: Wed, 6 Jan 2010 15:22:38 -0500
+Subject: [PATCH] Add flags for statvfs.f_flag to constant list.
+
+You really need these to figure out what statvfs is trying to say to
+you, so add them here.
+---
+ Modules/posixmodule.c |   37 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 37 insertions(+), 0 deletions(-)
+
+Index: b/Modules/posixmodule.c
+===================================================================
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -9411,6 +9411,43 @@ all_ins(PyObject *d)
+     if (ins(d, "EX_NOTFOUND", (long)EX_NOTFOUND)) return -1;
+ #endif /* EX_NOTFOUND */
+ 
++	/* These came from statvfs.h */
++#ifdef ST_RDONLY
++	if (ins(d, "ST_RDONLY", (long)ST_RDONLY)) return -1;
++#endif /* ST_RDONLY */
++#ifdef ST_NOSUID
++	if (ins(d, "ST_NOSUID", (long)ST_NOSUID)) return -1;
++#endif /* ST_NOSUID */
++
++	/* GNU extensions */
++#ifdef ST_NODEV
++	if (ins(d, "ST_NODEV", (long)ST_NODEV)) return -1;
++#endif /* ST_NODEV */
++#ifdef ST_NOEXEC
++	if (ins(d, "ST_NOEXEC", (long)ST_NOEXEC)) return -1;
++#endif /* ST_NOEXEC */
++#ifdef ST_SYNCHRONOUS
++	if (ins(d, "ST_SYNCHRONOUS", (long)ST_SYNCHRONOUS)) return -1;
++#endif /* ST_SYNCHRONOUS */
++#ifdef ST_MANDLOCK
++	if (ins(d, "ST_MANDLOCK", (long)ST_MANDLOCK)) return -1;
++#endif /* ST_MANDLOCK */
++#ifdef ST_WRITE
++	if (ins(d, "ST_WRITE", (long)ST_WRITE)) return -1;
++#endif /* ST_WRITE */
++#ifdef ST_APPEND
++	if (ins(d, "ST_APPEND", (long)ST_APPEND)) return -1;
++#endif /* ST_APPEND */
++#ifdef ST_NOATIME
++	if (ins(d, "ST_NOATIME", (long)ST_NOATIME)) return -1;
++#endif /* ST_NOATIME */
++#ifdef ST_NODIRATIME
++	if (ins(d, "ST_NODIRATIME", (long)ST_NODIRATIME)) return -1;
++#endif /* ST_NODIRATIME */
++#ifdef ST_RELATIME
++	if (ins(d, "ST_RELATIME", (long)ST_RELATIME)) return -1;
++#endif /* ST_RELATIME */
++
+ #ifdef HAVE_SPAWNV
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+     if (ins(d, "P_WAIT", (long)P_WAIT)) return -1;
--- python2.7-2.7.12.orig/debian/patches/sys-multiarch.diff
+++ python2.7-2.7.12/debian/patches/sys-multiarch.diff
@@ -0,0 +1,25 @@
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1357,6 +1357,11 @@
+ 
+ Python/thread.o: @THREADHEADERS@
+ 
++Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
++	$(CC) -c $(PY_CORE_CFLAGS) \
++		-DMULTIARCH='"$(MULTIARCH)"' \
++		-o $@ $(srcdir)/Python/sysmodule.c
++
+ # Declare targets that aren't real files
+ .PHONY: all build_all sharedmods oldsharedmods test quicktest memtest
+ .PHONY: install altinstall oldsharedinstall bininstall altbininstall
+--- a/Python/sysmodule.c
++++ b/Python/sysmodule.c
+@@ -1435,6 +1435,8 @@
+                         PyFloat_GetInfo());
+     SET_SYS_FROM_STRING("long_info",
+                         PyLong_GetInfo());
++    SET_SYS_FROM_STRING("_multiarch",
++                        PyString_FromString(MULTIARCH));
+ #ifdef Py_USING_UNICODE
+     SET_SYS_FROM_STRING("maxunicode",
+                         PyInt_FromLong(PyUnicode_GetMax()));
--- python2.7-2.7.12.orig/debian/patches/test-sundry.diff
+++ python2.7-2.7.12/debian/patches/test-sundry.diff
@@ -0,0 +1,19 @@
+# DP: test_sundry: Don't fail on import of the profile and pstats module
+
+Index: b/Lib/test/test_sundry.py
+===================================================================
+--- a/Lib/test/test_sundry.py
++++ b/Lib/test/test_sundry.py
+@@ -60,7 +60,11 @@ class TestUntestedModules(unittest.TestC
+             import os2emxpath
+             import pdb
+             import posixfile
+-            import pstats
++            try:
++                import pstats  # separated out into the python-profiler package
++            except ImportError:
++                if test_support.verbose:
++                    print "skipping profile and pstats"
+             import py_compile
+             import rexec
+             import sched
--- python2.7-2.7.12.orig/debian/patches/tkinter-import.diff
+++ python2.7-2.7.12/debian/patches/tkinter-import.diff
@@ -0,0 +1,35 @@
+# DP: suggest installation of python-tk package on failing _tkinter import
+
+--- a/Lib/lib-tk/Tkinter.py
++++ b/Lib/lib-tk/Tkinter.py
+@@ -36,7 +36,10 @@
+ if sys.platform == "win32":
+     # Attempt to configure Tcl/Tk without requiring PATH
+     import FixTk
+-import _tkinter # If this fails your Python may not be configured for Tk
++try:
++    import _tkinter
++except ImportError, msg:
++    raise ImportError, str(msg) + ', please install the python-tk package'
+ tkinter = _tkinter # b/w compat for export
+ TclError = _tkinter.TclError
+ from types import *
+--- a/Demo/turtle/turtleDemo.py
++++ b/Demo/turtle/turtleDemo.py
+@@ -3,10 +3,12 @@
+ import os
+ 
+ from Tkinter import *
+-from idlelib.Percolator import Percolator
+-from idlelib.ColorDelegator import ColorDelegator
+-from idlelib.textView import view_file
+-
++try:
++    from idlelib.Percolator import Percolator
++    from idlelib.ColorDelegator import ColorDelegator
++    from idlelib.textView import view_file
++except ImportError, msg:
++    raise ImportError, str(msg) + ', please install the idle package'
+ import turtle
+ import time
+ 
--- python2.7-2.7.12.orig/debian/pdb.1.in
+++ python2.7-2.7.12/debian/pdb.1.in
@@ -0,0 +1,16 @@
+.TH PDB@VER@ 1
+.SH NAME
+pdb@VER@ \- the Python debugger
+.SH SYNOPSIS
+.PP
+.B pdb@VER@
+.I script [...]
+.SH DESCRIPTION
+.PP
+See /usr/lib/python@VER@/pdb.doc for more information on the use
+of pdb.  When the debugger is started, help is available via the
+help command.
+.SH SEE ALSO
+python@VER@(1). Chapter 9 of the Python Library Reference
+(The Python Debugger). Available in the python@VER@-doc package at
+/usr/share/doc/python@VER@/html/lib/module-pdb.html.
--- python2.7-2.7.12.orig/debian/pydoc.1.in
+++ python2.7-2.7.12/debian/pydoc.1.in
@@ -0,0 +1,53 @@
+.TH PYDOC@VER@ 1
+.SH NAME
+pydoc@VER@ \- the Python documentation tool
+.SH SYNOPSIS
+.PP
+.B pydoc@VER@
+.I name
+.PP
+.B pydoc@VER@ -k
+.I keyword
+.PP
+.B pydoc@VER@ -p
+.I port
+.PP
+.B pydoc@VER@ -g
+.PP
+.B pydoc@VER@ -w
+.I module [...]
+.SH DESCRIPTION
+.PP
+.B pydoc@VER@
+.I name
+Show text documentation on something.
+.I name
+may be the name of a
+Python keyword, topic, function, module, or package, or a dotted
+reference to a class or function within a module or module in a
+package.  If
+.I name
+contains a '/', it is used as the path to a
+Python source file to document. If name is 'keywords', 'topics',
+or 'modules', a listing of these things is displayed.
+.PP
+.B pydoc@VER@ -k
+.I keyword
+Search for a keyword in the synopsis lines of all available modules.
+.PP
+.B pydoc@VER@ -p
+.I port
+Start an HTTP server on the given port on the local machine.
+.PP
+.B pydoc@VER@ -g
+Pop up a graphical interface for finding and serving documentation.
+.PP
+.B pydoc@VER@ -w
+.I name [...]
+Write out the HTML documentation for a module to a file in the current
+directory.  If
+.I name
+contains a '/', it is treated as a filename; if
+it names a directory, documentation is written for all the contents.
+.SH AUTHOR
+Moshe Zadka, based on "pydoc --help"
--- python2.7-2.7.12.orig/debian/pygettext.1
+++ python2.7-2.7.12/debian/pygettext.1
@@ -0,0 +1,108 @@
+.TH PYGETTEXT 1 "" "pygettext 1.4"
+.SH NAME
+pygettext \- Python equivalent of xgettext(1)
+.SH SYNOPSIS
+.B pygettext
+[\fIOPTIONS\fR] \fIINPUTFILE \fR...
+.SH DESCRIPTION
+pygettext is deprecated. The current version of xgettext supports
+many languages, including Python.
+
+pygettext uses Python's standard tokenize module to scan Python
+source code, generating .pot files identical to what GNU xgettext generates
+for C and C++ code.  From there, the standard GNU tools can be used.
+.PP
+pygettext searches only for _() by default, even though GNU xgettext
+recognizes the following keywords: gettext, dgettext, dcgettext,
+and gettext_noop. See the \fB\-k\fR/\fB\--keyword\fR flag below for how to
+augment this.
+.PP
+.SH OPTIONS
+.TP
+\fB\-a\fR, \fB\-\-extract\-all\fR
+Extract all strings.
+.TP
+\fB\-d\fR, \fB\-\-default\-domain\fR=\fINAME\fR
+Rename the default output file from messages.pot to name.pot.
+.TP
+\fB\-E\fR, \fB\-\-escape\fR
+Replace non-ASCII characters with octal escape sequences.
+.TP
+\fB\-D\fR, \fB\-\-docstrings\fR
+Extract module, class, method, and function docstrings.
+These do not need to be wrapped in _() markers, and in fact cannot
+be for Python to consider them docstrings. (See also the \fB\-X\fR option).
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print this help message and exit.
+.TP
+\fB\-k\fR, \fB\-\-keyword\fR=\fIWORD\fR
+Keywords to look for in addition to the default set, which are: _
+.IP
+You can have multiple \fB\-k\fR flags on the command line.
+.TP
+\fB\-K\fR, \fB\-\-no\-default\-keywords\fR
+Disable the default set of keywords (see above).
+Any keywords explicitly added with the \fB\-k\fR/\fB\--keyword\fR option
+are still recognized.
+.TP
+\fB\-\-no\-location\fR
+Do not write filename/lineno location comments.
+.TP
+\fB\-n\fR, \fB\-\-add\-location\fR
+Write filename/lineno location comments indicating where each
+extracted string is found in the source.  These lines appear before
+each msgid.  The style of comments is controlled by the
+\fB\-S\fR/\fB\--style\fR option.  This is the default.
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR
+Rename the default output file from messages.pot to FILENAME.
+If FILENAME is `-' then the output is sent to standard out.
+.TP
+\fB\-p\fR, \fB\-\-output\-dir\fR=\fIDIR\fR
+Output files will be placed in directory DIR.
+.TP
+\fB\-S\fR, \fB\-\-style\fR=\fISTYLENAME\fR
+Specify which style to use for location comments.
+Two styles are supported:
+.RS
+.IP \(bu 4
+Solaris	# File: filename, line: line-number
+.IP \(bu 4
+GNU		#: filename:line
+.RE
+.IP
+The style name is case insensitive.
+GNU style is the default.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Print the names of the files being processed.
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print the version of pygettext and exit.
+.TP
+\fB\-w\fR, \fB\-\-width\fR=\fICOLUMNS\fR
+Set width of output to columns.
+.TP
+\fB\-x\fR, \fB\-\-exclude\-file\fR=\fIFILENAME\fR
+Specify a file that contains a list of strings that are not be
+extracted from the input files.  Each string to be excluded must
+appear on a line by itself in the file.
+.TP
+\fB\-X\fR, \fB\-\-no\-docstrings\fR=\fIFILENAME\fR
+Specify a file that contains a list of files (one per line) that
+should not have their docstrings extracted.  This is only useful in
+conjunction with the \fB\-D\fR option above.
+.PP
+If `INPUTFILE' is -, standard input is read.
+.SH BUGS
+pygettext attempts to be option and feature compatible with GNU xgettext
+where ever possible.  However some options are still missing or are not fully
+implemented.  Also, xgettext's use of command line switches with option
+arguments is broken, and in these cases, pygettext just defines additional
+switches.
+.SH AUTHOR
+pygettext is written by Barry Warsaw .
+.PP
+Joonas Paalasmaa  put this manual page together
+based on "pygettext --help".
--- python2.7-2.7.12.orig/debian/pyhtml2devhelp.py
+++ python2.7-2.7.12/debian/pyhtml2devhelp.py
@@ -0,0 +1,222 @@
+#! /usr/bin/python
+
+import formatter, htmllib
+import os, sys, re
+
+class PyHTMLParser(htmllib.HTMLParser):
+    pages_to_include = set(('whatsnew/index.html', 'tutorial/index.html', 'using/index.html',
+                            'reference/index.html', 'library/index.html', 'howto/index.html',
+                            'extending/index.html', 'c-api/index.html', 'install/index.html',
+                            'distutils/index.html'))
+
+    def __init__(self, formatter, basedir, fn, indent, parents=set()):
+        htmllib.HTMLParser.__init__(self, formatter)
+        self.basedir = basedir
+        self.dir, self.fn = os.path.split(fn)
+        self.data = ''
+        self.parents = parents
+        self.link = {}
+        self.indent = indent
+        self.last_indent = indent - 1
+        self.sub_indent = 0
+        self.sub_count = 0
+        self.next_link = False
+
+    def process_link(self):
+        new_href = os.path.join(self.dir, self.link['href'])
+        text = self.link['text']
+        indent = self.indent + self.sub_indent
+        if self.last_indent == indent:
+            print '%s' % ('  ' * self.last_indent)
+            self.sub_count -= 1
+        print '%s_{' % ('  ' * indent, new_href, text)
+        self.sub_count += 1
+        self.last_indent = self.indent + self.sub_indent
+
+    def start_li(self, attrs):
+        self.sub_indent += 1
+        self.next_link = True
+
+    def end_li(self):
+        indent = self.indent + self.sub_indent
+        if self.sub_count > 0:
+            print '%s}' % ('  ' * self.last_indent)
+            self.sub_count -= 1
+            self.last_indent -= 1
+        self.sub_indent -= 1
+
+    def start_a(self, attrs):
+        self.link = {}
+        for attr in attrs:
+            self.link[attr[0]] = attr[1]
+        self.data = ''
+        
+    def end_a(self):
+        process = False
+        text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>')
+        self.link['text'] = text
+        # handle a tag without href attribute
+        try:
+            href = self.link['href']
+        except KeyError:
+            return
+
+        abs_href = os.path.join(self.basedir, href)
+        if abs_href in self.parents:
+            return
+        if href.startswith('..') or href.startswith('http:') \
+               or href.startswith('mailto:') or href.startswith('news:'):
+            return
+        if href in ('', 'about.html', 'modindex.html', 'genindex.html', 'glossary.html',
+                    'search.html', 'contents.html', 'download.html', 'bugs.html',
+                    'license.html', 'copyright.html'):
+            return
+
+        if self.link.has_key('class'):
+            if self.link['class'] in ('biglink'):
+                process = True
+            if self.link['class'] in ('reference external'):
+                if self.next_link:
+                    process = True
+                    next_link = False
+
+        if process == True:
+            self.process_link()
+            if href in self.pages_to_include:
+                self.parse_file(os.path.join(self.dir, href))
+
+    def finish(self):
+        if self.sub_count > 0:
+            print '%s' % ('  ' * self.last_indent)
+
+    def handle_data(self, data):
+        self.data += data
+
+    def parse_file(self, href):
+        # TODO basedir bestimmen
+        parent = os.path.join(self.basedir, self.fn)
+        self.parents.add(parent)
+        parser = PyHTMLParser(formatter.NullFormatter(),
+                              self.basedir, href, self.indent + 1,
+                              self.parents)
+        text = file(self.basedir + '/' + href).read()
+        parser.feed(text)
+        parser.finish()
+        parser.close()
+        if parent in self.parents:
+            self.parents.remove(parent)
+
+class PyIdxHTMLParser(htmllib.HTMLParser):
+    def __init__(self, formatter, basedir, fn, indent):
+        htmllib.HTMLParser.__init__(self, formatter)
+        self.basedir = basedir
+        self.dir, self.fn = os.path.split(fn)
+        self.data = ''
+        self.link = {}
+        self.indent = indent
+        self.active = False
+        self.indented = False
+        self.nolink = False
+        self.header = ''
+        self.last_letter = 'Z'
+        self.last_text = ''
+
+    def process_link(self):
+        new_href = os.path.join(self.dir, self.link['href'])
+        text = self.link['text']
+        if not self.active:
+            return
+        if text.startswith('['):
+            return
+        if self.link.get('rel', None) in ('prev', 'parent', 'next', 'contents', 'index'):
+            return
+        if self.indented:
+            text = self.last_text + ' ' + text
+        else:
+            # Save it in case we need it again
+            self.last_text = re.sub(' \([\w\-\.\s]+\)', '', text)
+        indent = self.indent
+        print '%s' % ('  ' * indent, new_href, text)
+
+    def start_dl(self, attrs):
+        if self.last_text:
+            # Looks like we found the second part to a command
+            self.indented = True
+
+    def end_dl(self):
+        self.indented = False
+
+    def start_dt(self, attrs):
+        self.data = ''
+        self.nolink = True
+
+    def end_dt(self):
+        if not self.active:
+            return
+        if self.nolink == True:
+            # Looks like we found the first part to a command
+            self.last_text = re.sub(' \([\w\-\.\s]+\)', '', self.data)
+            self.nolink = False
+
+    def start_h2(self, attrs):
+        for k, v in attrs:
+            if k == 'id':
+                self.header = v
+                if v == '_':
+                    self.active = True
+
+    def start_td(self, attrs):
+        self.indented = False
+        self.last_text = ''
+
+    def start_table(self, attrs):
+        pass
+
+    def end_table(self):
+        if self.header == self.last_letter:
+            self.active = False
+
+    def start_a(self, attrs):
+        self.nolink = False
+        self.link = {}
+        for attr in attrs:
+            self.link[attr[0]] = attr[1]
+        self.data = ''
+        
+    def end_a(self):
+        text = self.data.replace('\t', '').replace('\n', ' ').replace('&', '&').replace('<', '<').replace('>', '>')
+        self.link['text'] = text
+        # handle a tag without href attribute
+        try:
+            href = self.link['href']
+        except KeyError:
+            return
+        self.process_link()
+
+    def handle_data(self, data):
+        self.data += data
+
+def main():
+    base = sys.argv[1]
+    fn = sys.argv[2]
+    version = sys.argv[3]
+
+    parser = PyHTMLParser(formatter.NullFormatter(), base, fn, indent=0)
+    print ''
+    print '' % (version, version)
+    print ''
+    parser.parse_file(fn)
+    print ''
+
+    print ''
+
+    fn = 'genindex-all.html'
+    parser = PyIdxHTMLParser(formatter.NullFormatter(), base, fn, indent=1)
+    text = file(base + '/' + fn).read()
+    parser.feed(text)
+    parser.close()
+
+    print ''
+    print ''
+
+main()
--- python2.7-2.7.12.orig/debian/pylogo.xpm
+++ python2.7-2.7.12/debian/pylogo.xpm
@@ -0,0 +1,351 @@
+/* XPM */
+static char * pylogo_xpm[] = {
+"32 32 316 2",
+"  	c None",
+". 	c #8DB0CE",
+"+ 	c #6396BF",
+"@ 	c #4985B7",
+"# 	c #4181B5",
+"$ 	c #417EB2",
+"% 	c #417EB1",
+"& 	c #4D83B0",
+"* 	c #6290B6",
+"= 	c #94B2CA",
+"- 	c #70A1C8",
+"; 	c #3D83BC",
+"> 	c #3881BD",
+", 	c #387DB6",
+"' 	c #387CB5",
+") 	c #387BB3",
+"! 	c #3779B0",
+"~ 	c #3778AE",
+"{ 	c #3776AB",
+"] 	c #3776AA",
+"^ 	c #3775A9",
+"/ 	c #4A7FAC",
+"( 	c #709FC5",
+"_ 	c #3A83BE",
+": 	c #5795C7",
+"< 	c #94B9DB",
+"[ 	c #73A4CE",
+"} 	c #3D80B7",
+"| 	c #387CB4",
+"1 	c #377AB2",
+"2 	c #377AB0",
+"3 	c #3777AC",
+"4 	c #3774A7",
+"5 	c #3773A5",
+"6 	c #3C73A5",
+"7 	c #4586BB",
+"8 	c #4489C1",
+"9 	c #A7C7E1",
+"0 	c #F7F9FD",
+"a 	c #E1E9F1",
+"b 	c #4C89BC",
+"c 	c #3779AF",
+"d 	c #3778AD",
+"e 	c #3873A5",
+"f 	c #4B7CA4",
+"g 	c #3982BE",
+"h 	c #4389C1",
+"i 	c #A6C6E1",
+"j 	c #F6F9FC",
+"k 	c #D6E4F0",
+"l 	c #4A88BB",
+"m 	c #3773A6",
+"n 	c #366F9F",
+"o 	c #366E9D",
+"p 	c #376E9C",
+"q 	c #4A8BC0",
+"r 	c #79A7CD",
+"s 	c #548EBD",
+"t 	c #387AB0",
+"u 	c #3773A4",
+"v 	c #366D9C",
+"w 	c #387FBA",
+"x 	c #387DB7",
+"y 	c #387BB4",
+"z 	c #3775A8",
+"A 	c #366FA0",
+"B 	c #4981AF",
+"C 	c #427BAA",
+"D 	c #3772A4",
+"E 	c #376B97",
+"F 	c #77A3C8",
+"G 	c #4586BC",
+"H 	c #3882BE",
+"I 	c #3B76A7",
+"J 	c #3B76A6",
+"K 	c #366E9E",
+"L 	c #376B98",
+"M 	c #376B96",
+"N 	c #5681A3",
+"O 	c #F5EEB8",
+"P 	c #FFED60",
+"Q 	c #FFE85B",
+"R 	c #FFE659",
+"S 	c #FDE55F",
+"T 	c #5592C4",
+"U 	c #3A83BF",
+"V 	c #3882BD",
+"W 	c #387FB9",
+"X 	c #3779AE",
+"Y 	c #366F9E",
+"Z 	c #366C98",
+"` 	c #376A94",
+" .	c #5D85A7",
+"..	c #F5EDB7",
+"+.	c #FFEA5D",
+"@.	c #FFE75A",
+"#.	c #FFE354",
+"$.	c #FDDD56",
+"%.	c #669DC8",
+"&.	c #3885C3",
+"*.	c #3884C2",
+"=.	c #387EB8",
+"-.	c #387CB6",
+";.	c #377AB1",
+">.	c #3772A3",
+",.	c #366D9B",
+"'.	c #F5EBB5",
+").	c #FFE557",
+"!.	c #FFE455",
+"~.	c #FFDF50",
+"{.	c #FFDB4C",
+"].	c #FAD862",
+"^.	c #8EB4D2",
+"/.	c #3C86C1",
+"(.	c #3883C0",
+"_.	c #3882BF",
+":.	c #3881BC",
+"<.	c #3880BB",
+"[.	c #3775AA",
+"}.	c #F5EAB3",
+"|.	c #FFE051",
+"1.	c #FFDE4F",
+"2.	c #FFDA4A",
+"3.	c #FED446",
+"4.	c #F5DF9D",
+"5.	c #77A5CA",
+"6.	c #3885C2",
+"7.	c #387BB2",
+"8.	c #6B8EA8",
+"9.	c #F8E7A1",
+"0.	c #FFE153",
+"a.	c #FFDD4E",
+"b.	c #FFDB4B",
+"c.	c #FFD746",
+"d.	c #FFD645",
+"e.	c #FFD342",
+"f.	c #F6DB8D",
+"g.	c #508DBE",
+"h.	c #3771A3",
+"i.	c #376A95",
+"j.	c #3D6F97",
+"k.	c #C3CBC2",
+"l.	c #FBD964",
+"m.	c #FFDC4D",
+"n.	c #FFD544",
+"o.	c #FFD040",
+"p.	c #F9CF58",
+"q.	c #3F83BB",
+"r.	c #376B95",
+"s.	c #3A6C95",
+"t.	c #4E7BA0",
+"u.	c #91AABC",
+"v.	c #F6E4A3",
+"w.	c #FFDA4B",
+"x.	c #FFD646",
+"y.	c #FFD443",
+"z.	c #FFD241",
+"A.	c #FFCE3D",
+"B.	c #FFCC3B",
+"C.	c #FCC83E",
+"D.	c #3880BC",
+"E.	c #3C79AC",
+"F.	c #5F8DB4",
+"G.	c #7AA0C0",
+"H.	c #82A6C3",
+"I.	c #82A3BF",
+"J.	c #82A2BE",
+"K.	c #82A1BB",
+"L.	c #82A1B9",
+"M.	c #8BA4B5",
+"N.	c #C1C5AE",
+"O.	c #F2E19F",
+"P.	c #FDD74C",
+"Q.	c #FFD94A",
+"R.	c #FFD343",
+"S.	c #FFCE3E",
+"T.	c #FFCB39",
+"U.	c #FFC937",
+"V.	c #FEC636",
+"W.	c #3D79AB",
+"X.	c #9DB6C6",
+"Y.	c #D0CFA2",
+"Z.	c #EFE598",
+"`.	c #F8EE9B",
+" +	c #F8EB97",
+".+	c #F8E996",
+"++	c #F8E894",
+"@+	c #FAE489",
+"#+	c #FCDB64",
+"$+	c #FFDA4D",
+"%+	c #FFCF3E",
+"&+	c #FFCB3A",
+"*+	c #FFC734",
+"=+	c #FFC532",
+"-+	c #3F82B7",
+";+	c #387EB9",
+">+	c #9EB9D0",
+",+	c #F2E287",
+"'+	c #FDEB69",
+")+	c #FEEC60",
+"!+	c #FFEB5E",
+"~+	c #FFE254",
+"{+	c #FFE152",
+"]+	c #FFD747",
+"^+	c #FFC633",
+"/+	c #FCC235",
+"(+	c #578FBE",
+"_+	c #6996BC",
+":+	c #DED9A8",
+"<+	c #FEEC62",
+"[+	c #FFE658",
+"}+	c #FFDF51",
+"|+	c #FFDE50",
+"1+	c #FFD03F",
+"2+	c #FFCD3C",
+"3+	c #FFC431",
+"4+	c #FFBF2C",
+"5+	c #FAC244",
+"6+	c #85AACA",
+"7+	c #A1BBD2",
+"8+	c #F7E47C",
+"9+	c #FFE456",
+"0+	c #FFC735",
+"a+	c #FFBC29",
+"b+	c #F7D280",
+"c+	c #9DBAD2",
+"d+	c #3B7CB2",
+"e+	c #ABC2D6",
+"f+	c #FDEB7B",
+"g+	c #FFC12E",
+"h+	c #FDBD30",
+"i+	c #F4DEA8",
+"j+	c #5F91BA",
+"k+	c #ABC1D4",
+"l+	c #FDEE7E",
+"m+	c #FFE253",
+"n+	c #FFCC3C",
+"o+	c #FFBA27",
+"p+	c #FAC75B",
+"q+	c #4A82B0",
+"r+	c #3877AB",
+"s+	c #3774A6",
+"t+	c #AAC0D4",
+"u+	c #FDEE7D",
+"v+	c #FFEC5F",
+"w+	c #FFE255",
+"x+	c #FFD848",
+"y+	c #FFD444",
+"z+	c #FFCF3F",
+"A+	c #FFBC2A",
+"B+	c #FFBB28",
+"C+	c #FDBA32",
+"D+	c #447AA8",
+"E+	c #4379A7",
+"F+	c #FFE95C",
+"G+	c #FFE558",
+"H+	c #FFE355",
+"I+	c #FED84B",
+"J+	c #FCD149",
+"K+	c #FBCE47",
+"L+	c #FBCD46",
+"M+	c #FBC840",
+"N+	c #FBC63E",
+"O+	c #FBC037",
+"P+	c #FAC448",
+"Q+	c #FDD44C",
+"R+	c #FCD14E",
+"S+	c #FFC836",
+"T+	c #FFC22F",
+"U+	c #FFC02D",
+"V+	c #FFE052",
+"W+	c #FFC636",
+"X+	c #FFCF5C",
+"Y+	c #FFD573",
+"Z+	c #FFC33E",
+"`+	c #FEBD2D",
+" @	c #FFDB4D",
+".@	c #FFD949",
+"+@	c #FFD545",
+"@@	c #FFD140",
+"#@	c #FFCB48",
+"$@	c #FFF7E4",
+"%@	c #FFFCF6",
+"&@	c #FFE09D",
+"*@	c #FFBA2E",
+"=@	c #FDBE2F",
+"-@	c #FFD748",
+";@	c #FFCA38",
+">@	c #FFC844",
+",@	c #FFF2D7",
+"'@	c #FFF9EC",
+")@	c #FFDB94",
+"!@	c #FFB92D",
+"~@	c #FAC54D",
+"{@	c #FDD54E",
+"]@	c #FFBD2D",
+"^@	c #FFC858",
+"/@	c #FFD174",
+"(@	c #FFBF3E",
+"_@	c #FCBD3C",
+":@	c #FAD66A",
+"<@	c #FECD3F",
+"[@	c #FFC330",
+"}@	c #FFBD2A",
+"|@	c #FFB724",
+"1@	c #FFB521",
+"2@	c #FFB526",
+"3@	c #FBC457",
+"4@	c #F7E09E",
+"5@	c #F8D781",
+"6@	c #FAC349",
+"7@	c #FCC134",
+"8@	c #FEBE2C",
+"9@	c #FBBE3F",
+"0@	c #F7CF79",
+"a@	c #F5D795",
+"                      . + @ # $ % % & * =                       ",
+"                  - ; > > , ' ) ! ~ { ] ^ /                     ",
+"                ( _ : < [ } | 1 2 ~ 3 4 5 5 6                   ",
+"                7 8 9 0 a b 2 c d 3 { 5 5 5 e f                 ",
+"                g h i j k l c ~ { { m 5 5 n o p                 ",
+"                > > q r s t c c d 4 5 u n v v v                 ",
+"                w x ' y 2 c d d z 5 u A v v v v                 ",
+"                              B C 5 D v v v v E                 ",
+"      F G H H H x ' ) c c c d I J 5 K v v L M N O P Q R S       ",
+"    T U H V V W ' ) c c X ~ 5 5 5 Y v v Z ` `  ...+.@.#.#.$.    ",
+"  %.&.*.> w W =.-.;.c 3 { ^ 5 5 >.o v ,.E ` `  .'.).!.#.~.{.].  ",
+"^./.(._.:.<., ' ) ;.X d [.5 5 >.K v ,.E ` ` `  .}.#.|.1.{.2.3.4.",
+"5.6.(.H H x ' 7.c c 3 3 4 5 D K v v ,.` ` ` ` 8.9.0.a.b.c.d.e.f.",
+"g._.> <.w ' ' | 2 3 { z 5 5 h.v v v i.` ` ` j.k.l.m.{.d.n.e.o.p.",
+"q.> > :.-.' 1 c c c ] 5 5 >.v v ,.r.` ` s.t.u.v.{.w.x.y.z.A.B.C.",
+"D.D.w -.' 1 c c c E.F.G.H.I.J.J.K.L.L.L.M.N.O.P.Q.c.R.S.B.T.U.V.",
+"D.D.=.' ' 1 c c W.X.Y.Z.`.`.`.`.`. +.+++@+#+$+Q.d.R.%+B.&+*+=+=+",
+"-+;+-.' ;.2 c c >+,+'+)+P P P !+Q R ~+{+1.{.]+d.y.%+B.&+^+=+=+/+",
+"(+' ' ;.c X X _+:+<+P P P P !+R [+~+}+|+{.]+n.R.1+2+&+^+=+3+4+5+",
+"6+' ) ! ~ { { 7+8+P P P P !+R 9+#.{+{.w.]+y.z.S.&+0+=+=+3+4+a+b+",
+"c+d+7.! d 3 z e+f+P P P !+R 9+#.{+m.{.]+y.1+B.&+0+=+=+g+4+a+h+i+",
+"  j+c d 3 { 4 k+l+P P !+@.9+m+1.m.{.]+y.1+n+B.*+=+=+g+a+a+o+p+  ",
+"    q+r+{ s+m t+u+v+@.R w+{+}+{.x+d.y+z+n+B.0+=+=+g+A+a+B+C+    ",
+"      * D+E+E+  +.F+G+H+}+}+{.I+J+K+L+M+M+M+M+N+O+O+O+O+P+      ",
+"                ).).#.{+a.{.x+Q+R+                              ",
+"                #.m+1.a.{.x+y.o.2+B.S+=+=+T+U+O+                ",
+"                0.V+{.{.x+n.o.2+B.B.W+X+Y+Z+a+`+                ",
+"                 @{..@+@n.@@B.B.S+^+#@$@%@&@*@=@                ",
+"                ].-@x.y.o.%+;@S+=+=+>@,@'@)@!@~@                ",
+"                  {@z.z+2+U.=+=+=+T+]@^@/@(@_@                  ",
+"                    :@<@U.=+=+[@4+}@|@1@2@3@                    ",
+"                      4@5@6@7@8@a+a+9@0@a@                      "};
--- python2.7-2.7.12.orig/debian/pymindeps.py
+++ python2.7-2.7.12/debian/pymindeps.py
@@ -0,0 +1,174 @@
+#! /usr/bin/python
+
+# Matthias Klose
+# Modified to only exclude module imports from a given module.
+
+# Copyright 2004 Toby Dickenson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject
+# to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import os, sys, pprint
+import modulefinder
+import imp
+
+class mymf(modulefinder.ModuleFinder):
+    def __init__(self,*args,**kwargs):
+        self._depgraph = {}
+        self._types = {}
+        self._last_caller = None
+        modulefinder.ModuleFinder.__init__(self, *args, **kwargs)
+        
+    def import_hook(self, name, caller=None, fromlist=None, level=-1):
+        old_last_caller = self._last_caller
+        try:
+            self._last_caller = caller
+            return modulefinder.ModuleFinder.import_hook(self, name, caller,
+                                                         fromlist, level)
+        finally:
+            self._last_caller = old_last_caller
+            
+    def import_module(self, partnam, fqname, parent):
+        m = modulefinder.ModuleFinder.import_module(self,
+                                                    partnam, fqname, parent)
+        if m is not None and self._last_caller:
+            caller = self._last_caller.__name__
+            if '.' in caller:
+                caller = caller[:caller.index('.')]
+            callee =  m.__name__
+            if '.' in callee:
+                callee = callee[:callee.index('.')]
+            #print "XXX last_caller", caller, "MOD", callee
+            #self._depgraph.setdefault(self._last_caller.__name__,{})[r.__name__] = 1
+            #if caller in ('pdb', 'doctest') or callee in ('pdb', 'doctest'):
+            #    print caller, "-->", callee
+            if caller != callee:
+                self._depgraph.setdefault(caller,{})[callee] = 1
+        return m
+    
+    def find_module(self, name, path, parent=None):
+        if parent is not None:
+            # assert path is not None
+            fullname = parent.__name__+'.'+name
+        elif name == "__init__":
+            fullname = os.path.basename(path[0])
+        else:
+            fullname = name
+        if self._last_caller:
+            caller = self._last_caller.__name__
+            if fullname in excluded_imports.get(caller, []):
+                #self.msgout(3, "find_module -> Excluded", fullname)
+                raise ImportError, name
+
+        if fullname in self.excludes:
+            #self.msgout(3, "find_module -> Excluded", fullname)
+            raise ImportError, name
+
+        if path is None:
+            if name in sys.builtin_module_names:
+                return (None, None, ("", "", imp.C_BUILTIN))
+
+            path = self.path
+        return imp.find_module(name, path)
+
+    def load_module(self, fqname, fp, pathname, file_info):
+        suffix, mode, type = file_info
+        m = modulefinder.ModuleFinder.load_module(self, fqname,
+                                                  fp, pathname, file_info)
+        if m is not None:
+            self._types[m.__name__] = type
+        return m
+
+    def load_package(self, fqname, pathname):
+        m = modulefinder.ModuleFinder.load_package(self, fqname,pathname)
+        if m is not None:
+            self._types[m.__name__] = imp.PKG_DIRECTORY
+        return m
+ 
+def reduce_depgraph(dg):
+    pass
+
+# guarded imports, which don't need to be included in python-minimal
+excluded_imports = {
+    'collections': set(('doctest', 'dummy_thread', 'cPickle')),
+    'copy': set(('reprlib',)),
+    'difflib': set(('doctest',)),
+    'hashlib': set(('logging',)),
+    'hashlib': set(('_hashlib', '_md5', '_sha', '_sha256','_sha512',)),
+    'heapq': set(('doctest',)),
+    'inspect': set(('compiler',)),
+    'os': set(('nt', 'ntpath', 'os2', 'os2emxpath', 'mac', 'macpath',
+               'riscos', 'riscospath', 'riscosenviron')),
+    'optparse': set(('gettext',)),
+    'pickle': set(('doctest',)),
+    'platform': set(('ctypes', 'plistlib', 'tempfile', 'winreg')),
+    #'socket': set(('_ssl', 'ssl')),
+    'tempfile': set(('dummy_thread',)),
+    'subprocess': set(('threading',)),
+    'shutil': set(('distutils', 'tarfile', 'zipfile')),
+    'sysconfig': set(('pprint', '_osx_support')),
+    }
+
+def main(argv):
+    # Parse command line
+    import getopt
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "dmp:qx:")
+    except getopt.error as msg:
+        print(msg)
+        return
+
+    # Process options
+    debug = 1
+    domods = 0
+    addpath = []
+    exclude = []
+    for o, a in opts:
+        if o == '-d':
+            debug = debug + 1
+        if o == '-m':
+            domods = 1
+        if o == '-p':
+            addpath = addpath + a.split(os.pathsep)
+        if o == '-q':
+            debug = 0
+        if o == '-x':
+            exclude.append(a)
+
+    path = sys.path[:]
+    path = addpath + path
+
+    if debug > 1:
+        print("version:", sys.version)
+        print("path:")
+        for item in path:
+            print("   ", repr(item))
+
+    #exclude = ['__builtin__', 'sys', 'os']
+    exclude = []
+    mf = mymf(path, debug, exclude)
+    for arg in args:
+        mf.run_script(arg)
+
+    depgraph = reduce_depgraph(mf._depgraph)
+    
+    pprint.pprint({'depgraph':mf._depgraph, 'types':mf._types})
+    
+if __name__=='__main__':
+    main(sys.argv[1:])
--- python2.7-2.7.12.orig/debian/python-config.1
+++ python2.7-2.7.12/debian/python-config.1
@@ -0,0 +1,102 @@
+.TH PYTHON\-CONFIG 1 "November 27, 2011"
+.SH NAME
+python\-config \- output build options for python C/C++ extensions or embedding
+.SH SYNOPSIS
+.BI "python\-config"
+[
+.BI "\-\-prefix"
+]
+[
+.BI "\-\-exec\-prefix"
+]
+[
+.BI "\-\-includes"
+]
+[
+.BI "\-\-libs"
+]
+[
+.BI "\-\-cflags"
+]
+[
+.BI "\-\-ldflags"
+]
+[
+.BI "\-\-extension\-suffix"
+]
+[
+.BI "\-\-configdir"
+]
+[
+.BI "\-\-help"
+]
+.SH DESCRIPTION
+.B python\-config
+helps compiling and linking programs, which embed the Python interpreter, or
+extension modules that can be loaded dynamically (at run time) into
+the interpreter.
+.SH OPTIONS
+.TP
+.BI "\-\-cflags"
+print the C compiler flags.
+.TP
+.BI "\-\-ldflags"
+print the flags that should be passed to the linker.
+.TP
+.BI "\-\-includes"
+similar to \fI\-\-cflags\fP but only with \-I options (path to python header files).
+.TP
+.BI "\-\-libs"
+similar to \fI\-\-ldflags\fP but only with \-l options (used libraries).
+.TP
+.BI "\-\-prefix"
+prints the prefix (base directory) under which python can be found.
+.TP
+.BI "\-\-exec\-prefix"
+print the prefix used for executable program directories (such as bin, sbin, etc).
+.TP
+.BI "\-\-extension\-suffix"
+print suffix used for extension modules (including the _d modified for debug builds).
+.TP
+.BI "\-\-configdir"
+prints the path to the configuration directory under which the Makefile, etc. can be found).
+.TP
+.BI "\-\-help"
+print the usage message.
+.PP
+
+.SH EXAMPLES
+To build the singe\-file c program \fIprog\fP against the python library, use
+.PP
+.RS
+gcc $(python\-config \-\-cflags \-\-ldflags) progr.cpp \-o progr.cpp
+.RE
+.PP
+The same in a makefile:
+.PP
+.RS
+CFLAGS+=$(shell python\-config \-\-cflags)
+.RE
+.RS
+LDFLAGS+=$(shell python\-config \-\-ldflags)
+.RE
+.RS
+all: progr
+.RE
+
+To build a dynamically loadable python module, use
+.PP
+.RS
+gcc $(python\-config \-\-cflags \-\-ldflags) \-shared \-fPIC progr.cpp \-o progr.so
+.RE
+
+.SH "SEE ALSO"
+python (1)
+.br
+http://docs.python.org/extending/extending.html
+.br
+/usr/share/doc/python/faq/extending.html
+
+.SH AUTHORS
+This manual page was written by Johann Felix Soden 
+for the Debian project (and may be used by others).
--- python2.7-2.7.12.orig/debian/rules
+++ python2.7-2.7.12/debian/rules
@@ -0,0 +1,1435 @@
+#!/usr/bin/make -f
+
+unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES
+unexport CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+
+export SHELL = /bin/bash
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
+
+DPKG_VARS		:= $(shell dpkg-architecture)
+DEB_BUILD_ARCH		?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_ARCH)
+DEB_BUILD_GNU_TYPE	?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH		?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
+DEB_HOST_ARCH_BITS	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH_ENDIAN	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_ENDIAN)
+DEB_HOST_ARCH_OS	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
+
+changelog_values := $(shell dpkg-parsechangelog \
+			| awk '/^(Version|Source):/ {print $$2}')
+PKGSOURCE  := $(word 1, $(changelog_values))
+PKGVERSION := $(word 2, $(changelog_values))
+
+LAST_CHANGE := $(shell dpkg-parsechangelog -S Date)
+export BUILD_DATE := $(shell LC_ALL=C date -u +'%b %e %Y' -d '$(LAST_CHANGE)')
+export BUILD_TIME := $(shell LC_ALL=C date -u +'%H:%M:%S' -d '$(LAST_CHANGE)')
+
+SPHINXOPTS := -D today='$(shell LC_ALL=C date -u +'%B %d, %Y' -d '$(LAST_CHANGE)')'
+SPHINXOPTS += -D html_last_updated_fmt='$(shell LC_ALL=C date -u +'%B %d, %Y' -d '$(LAST_CHANGE)')'
+export SPHINXOPTS
+
+on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd -o "$$USER" = buildd ] && echo yes)
+
+dh_compat2 := $(shell dpkg --compare-versions "$$(dpkg-query -f '$${Version}' -W debhelper)" lt 9.20150811ubuntu2 && echo DH_COMPAT=2)
+
+ifneq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+  WITHOUT_CHECK := yes
+endif
+WITHOUT_BENCH :=
+ifneq (,$(findstring nobench, $(DEB_BUILD_OPTIONS)))
+  WITHOUT_BENCH := yes
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386))
+  WITHOUT_BENCH := disabled on $(DEB_HOST_ARCH)
+endif
+ifeq ($(on_buildd),yes)
+  ifneq (,$(findstring $(DEB_HOST_ARCH), hppa mips mipsel mipsn32 mipsn32el mips64 mips64el s390))
+    WITHOUT_CHECK := yes
+  endif
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 kfreebsd-amd64 kfreebsd-i386))
+  WITHOUT_CHECK := yes
+endif
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+  WITHOUT_BENCH := yes
+  WITHOUT_CHECK := yes
+endif
+
+COMMA = ,
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+
+distribution := $(shell lsb_release -is)
+distrelease  := $(shell lsb_release -cs)
+derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \
+               elif dpkg-vendor --derives-from Debian; then echo Debian; \
+               else echo Unknown; fi)
+
+VER=2.7
+NVER=2.8
+PVER=python2.7
+PRIORITY=$(shell echo $(VER) | tr -d '.')0
+
+PREVVER	:= $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
+
+# default versions are built from the python-defaults source package
+# keep the definition to adjust package priorities.
+DEFAULT_VERSION = yes
+STATIC_PYTHON=yes
+
+MIN_MODS := $(shell awk '/^  / && $$2 == "module" { print $$1 }' \
+		debian/PVER-minimal.README.Debian.in)
+MIN_EXTS := $(shell awk '/^  / && $$2 ~ /^extension/ { print $$1 }' \
+		debian/PVER-minimal.README.Debian.in)
+MIN_BUILTINS := $(shell awk '/^  / && $$2 == "builtin" { print $$1 }' \
+		debian/PVER-minimal.README.Debian.in)
+MIN_PACKAGES := $(shell awk '/^  / && $$2 == "package" { print $$1 }' \
+		debian/PVER-minimal.README.Debian.in)
+MIN_ENCODINGS := $(foreach i, \
+			$(filter-out \
+			  big5% bz2% cp932.py cp949.py cp950.py euc_% \
+			  gb% iso2022% johab.py shift_jis% , \
+			  $(shell cd Lib/encodings && echo *.py)), \
+			encodings/$(i)) \
+		 codecs.py stringprep.py
+
+with_tk := no
+with_gdbm := no
+with_interp := static
+#with_interp := shared
+
+PY_INTERPRETER = /usr/bin/python$(VER)
+
+ifeq ($(DEFAULT_VERSION),yes)
+  PY_PRIO = standard
+  #PYSTDDEP = , python (>= $(VER))
+  PY_MINPRIO = $(PY_PRIO)
+else
+  PY_PRIO = optional
+  PY_MINPRIO = $(PY_PRIO)
+endif
+with_fpectl = yes
+
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric))
+  bd_qual = :any
+endif
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric))
+  ma_filter = cat
+else
+  ma_filter = grep -v '^Multi-Arch:'
+endif
+ifneq (,$(filter $(distrelease),jessie sid experimental))
+  bd_gcc =
+endif
+ifneq (,$(filter $(distrelease),stretch sid))
+  bd_gcc = gcc (>= 4:6.1),
+endif
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty))
+  bd_dpkgdev = dpkg-dev (>= 1.17.11),
+endif
+
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+CXX=$(DEB_HOST_GNU_TYPE)-g++
+
+AR=$(DEB_HOST_GNU_TYPE)-ar
+RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib
+
+DPKG_CFLAGS  := $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS)
+DPKG_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+OPT_CFLAGS   := $(filter-out -O%,$(DPKG_CFLAGS)) # default is -O3
+DEBUG_CFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(patsubst -O%,-O0,$(DPKG_CFLAGS)))
+
+# on alpha, use -O2 only, use -mieee
+ifeq ($(DEB_HOST_ARCH),alpha)
+    OPT_CFLAGS += -mieee
+    DEBUG_CFLAGS += -mieee
+    EXTRA_OPT_FLAGS += -O2
+endif
+# issues with ia64 and m68k with -O3
+ifeq ($(DEB_HOST_ARCH),m68k)
+    EXTRA_OPT_FLAGS += -O2
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc ppc64 ppc64el s390x x32))
+    with_pgo := yes
+  endif
+endif
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+  with_pgo :=
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc ppc64 ppc64el s390x x32))
+  with_lto := yes
+endif
+
+ifneq (,$(findstring noopt, $(DEB_BUILD_OPTIONS)))
+    OPT_CFLAGS := $(filter-out -O%, $(OPT_CFLAGS))
+    EXTRA_OPT_CFLAGS = -O0
+    with_pgo =
+    with_lto =
+endif
+
+ifeq ($(with_lto),yes)
+    LTO_CFLAGS = -g -flto -fuse-linker-plugin
+    with_fat_lto := $(shell dpkg --compare-versions $$($(CC) --version \
+			| sed -n '/^$(CC)/s/.* //p') ge 4.9 && echo yes)
+    ifeq ($(with_fat_lto),yes)
+      LTO_CFLAGS += -ffat-lto-objects
+    endif
+    EXTRA_OPT_CFLAGS += $(LTO_CFLAGS)
+    AR=$(DEB_HOST_GNU_TYPE)-gcc-ar
+    RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib
+endif
+
+make_build_target = $(if $(with_pgo),profile-opt)
+
+buildd_static	:= $(CURDIR)/build-static
+buildd_shared	:= $(CURDIR)/build-shared
+buildd_debug	:= $(CURDIR)/build-debug
+buildd_shdebug	:= $(CURDIR)/build-shdebug
+
+d		:= debian/tmp
+scriptdir	=  usr/share/lib/python$(VER)
+scriptdir	=  usr/share/python$(VER)
+scriptdir	=  usr/lib/python$(VER)
+
+# package names and directories
+p_base	:= $(PVER)
+p_min	:= $(PVER)-minimal
+p_lib	:= lib$(PVER)
+p_tk	:= $(PVER)-tk
+p_gdbm	:= $(PVER)-gdbm
+p_dev	:= $(PVER)-dev
+p_exam	:= $(PVER)-examples
+p_idle	:= idle-$(PVER)
+p_doc	:= $(PVER)-doc
+p_dbg	:= $(PVER)-dbg
+
+p_lbase	:= lib$(PVER)-stdlib
+p_lmin	:= lib$(PVER)-minimal
+p_ldev	:= lib$(PVER)-dev
+p_ldbg	:= lib$(PVER)-dbg
+p_ltst	:= lib$(PVER)-testsuite
+
+d_base	:= debian/$(p_base)
+d_min	:= debian/$(p_min)
+d_lib	:= debian/$(p_lib)
+d_tk	:= debian/$(p_tk)
+d_gdbm	:= debian/$(p_gdbm)
+d_dev	:= debian/$(p_dev)
+d_exam	:= debian/$(p_exam)
+d_idle	:= debian/$(p_idle)
+d_doc	:= debian/$(p_doc)
+d_dbg	:= debian/$(p_dbg)
+
+d_lbase	:= debian/$(p_lbase)
+d_lmin	:= debian/$(p_lmin)
+d_ldev	:= debian/$(p_ldev)
+d_ldbg	:= debian/$(p_ldbg)
+d_ltst	:= debian/$(p_ltst)
+
+build-arch: stamps/stamp-build
+build-indep: stamps/stamp-build-doc
+build: build-arch
+stamps/stamp-build: stamps/stamp-build-static stamps/stamp-mincheck \
+    stamps/stamp-build-shared stamps/stamp-build-debug \
+    stamps/stamp-build-shared-debug \
+    stamps/stamp-check stamps/stamp-pystone stamps/stamp-pybench
+	touch $@
+
+PROFILE_EXCLUDES = test_compiler test_distutils test_platform test_subprocess \
+	test_multiprocessing test_cprofile \
+	test_thread test_threaded_import test_threadedtempfile \
+	test_socketserver \
+	test_threading test_threading_local test_threadsignals \
+	test_dbm_dumb test_dbm_ndbm test_pydoc test_sundry test_gdb \
+
+ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
+  PROFILE_EXCLUDES += test_float
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), sparc kfreebsd-amd64 kfreebsd-i386))
+  PROFILE_EXCLUDES += test_io
+endif
+PROFILE_EXCLUDES += test_zipfile
+PROFILE_EXCLUDES += test_xmlrpc
+PROFILE_EXCLUDES += test_bsddb3
+
+PROFILE_TASK = ../Lib/test/regrtest.py \
+	-x $(sort $(TEST_EXCLUDES) $(PROFILE_EXCLUDES))
+
+stamps/stamp-build-static: stamps/stamp-configure-static
+	dh_testdir
+	$(MAKE) $(NJOBS) -C $(buildd_static) \
+		EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" \
+		PROFILE_TASK='$(PROFILE_TASK)' $(make_build_target)
+
+	: # check that things are correctly built
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+  ifneq (,$(filter $(DEB_HOST_ARCH_OS), linux))
+	cd $(buildd_static) && ./python -c 'from _multiprocessing import SemLock'
+  endif
+endif
+
+	touch stamps/stamp-build-static
+
+stamps/stamp-build-shared: stamps/stamp-configure-shared
+	dh_testdir
+	$(MAKE) $(NJOBS) -C $(buildd_shared) \
+		EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)"
+#	: # build the shared library
+#	$(MAKE) $(NJOBS) -C $(buildd_shared) \
+#		libpython$(VER).so
+	: # build a static library with PIC objects
+	$(MAKE) $(NJOBS) -C $(buildd_shared) \
+		EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" \
+		LIBRARY=libpython$(VER)-pic.a libpython$(VER)-pic.a
+	touch stamps/stamp-build-shared
+
+stamps/stamp-build-debug: stamps/stamp-configure-debug
+	dh_testdir
+	$(MAKE) $(NJOBS) -C $(buildd_debug) \
+		EXTRA_CFLAGS="$(DEBUG_CFLAGS)"
+	touch stamps/stamp-build-debug
+
+stamps/stamp-build-shared-debug: stamps/stamp-configure-shared-debug
+	dh_testdir
+	: # build the shared debug library
+	$(MAKE) $(NJOBS) -C $(buildd_shdebug) \
+		EXTRA_CFLAGS="$(DEBUG_CFLAGS)"
+	touch stamps/stamp-build-shared-debug
+
+common_configure_args = \
+		--prefix=/usr \
+		--enable-ipv6 \
+		--enable-unicode=ucs4 \
+		--with-dbmliborder=bdb:gdbm \
+		--with-system-expat \
+		--with-computed-gotos
+
+ifneq (,$(filter $(DEB_HOST_ARCH), avr32 or1k))
+  common_configure_args += --without-ffi
+else
+  common_configure_args += --with-system-ffi
+endif
+
+ifeq ($(with_fpectl),yes)
+  common_configure_args += \
+		--with-fpectl
+endif
+
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+  common_configure_args += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+  config_site = ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=yes
+  ifeq (,$(filter $(DEB_HOST_ARCH),arm m68k))
+    ifeq ($(DEB_HOST_ARCH_ENDIAN),little)
+      config_site += ac_cv_little_endian_double=yes
+    else
+      config_site += ac_cv_big_endian_double=yes
+    endif
+  endif
+endif
+
+stamps/stamp-configure-shared: stamps/stamp-patch
+	rm -rf $(buildd_shared)
+	mkdir -p $(buildd_shared)
+	cd $(buildd_shared) && \
+	  CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \
+	  CFLAGS="$(OPT_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \
+	    $(config_site) \
+	    ../configure \
+		--enable-shared \
+		$(common_configure_args)
+
+	$(call __post_configure,$(buildd_shared))
+
+	touch stamps/stamp-configure-shared
+
+stamps/stamp-configure-static: stamps/stamp-patch
+	rm -rf $(buildd_static)
+	mkdir -p $(buildd_static)
+	cd $(buildd_static) && \
+	  CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \
+	  CFLAGS="$(OPT_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \
+	    $(config_site) \
+	    ../configure \
+		$(common_configure_args)
+
+	$(call __post_configure,$(buildd_static))
+
+	touch stamps/stamp-configure-static
+
+stamps/stamp-configure-debug: stamps/stamp-patch
+	rm -rf $(buildd_debug)
+	mkdir -p $(buildd_debug)
+	cd $(buildd_debug) && \
+	  CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \
+	  CFLAGS="$(DEBUG_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \
+	    $(config_site) \
+	    ../configure \
+		$(common_configure_args) \
+		--with-pydebug
+
+	$(call __post_configure,$(buildd_debug))
+
+	touch stamps/stamp-configure-debug
+
+stamps/stamp-configure-shared-debug: stamps/stamp-patch
+	rm -rf $(buildd_shdebug)
+	mkdir -p $(buildd_shdebug)
+	cd $(buildd_shdebug) && \
+	  CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" \
+	  CFLAGS="$(DEBUG_CFLAGS)" LDFLAGS="$(DPKG_LDFLAGS)" \
+	    $(config_site) \
+	    ../configure \
+		$(common_configure_args) \
+		--enable-shared \
+		--with-pydebug
+
+	$(call __post_configure,$(buildd_shdebug))
+
+	touch stamps/stamp-configure-shared-debug
+
+define __post_configure
+	egrep \
+	  "^#($$(awk -v ORS='|' '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in)XX)" \
+	  Modules/Setup.dist \
+	    | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \
+	    >> $(1)/Modules/Setup.local
+
+	: # unconditionally run makesetup
+	cd $(1) && \
+	  ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
+	    Modules/Setup.config Modules/Setup.local Modules/Setup
+	mv $(1)/config.c $(1)/Modules/
+
+	: # and fix the timestamps
+	$(MAKE) -C $(1) Makefile Modules/config.c
+
+	: # apply workaround for missing os.fsync
+	sed 's/HAVE_SYNC/HAVE_FSYNC/g' $(1)/pyconfig.h \
+		> $(1)/pyconfig.h.new
+	touch -r $(1)/pyconfig.h $(1)/pyconfig.h.new
+	mv -f $(1)/pyconfig.h.new $(1)/pyconfig.h
+
+	: # this second rule doesn't build with -fPIC, remove it.
+	sed '/^Modules\/_math.o: .*PY_CORE_CFLAGS/d' $(1)/Makefile > $(1)/Makefile.fixed
+	touch -r $(1)/Makefile $(1)/Makefile.fixed
+	mv -f $(1)/Makefile.fixed $(1)/Makefile
+endef
+
+stamps/stamp-mincheck: stamps/stamp-build-static debian/PVER-minimal.README.Debian.in
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	for m in $(MIN_MODS) $(MIN_PACKAGES) $(MIN_EXTS) $(MIN_BUILTINS); do \
+	  echo "import $$m"; \
+	done > $(buildd_static)/minmods.py
+	cd $(buildd_static) && ./python ../debian/pymindeps.py minmods.py \
+	  > $(buildd_static)/mindeps.txt
+	if [ -x /usr/bin/dot ]; then \
+	  cd $(buildd_static); \
+	  ./python ../debian/depgraph.py < mindeps.txt > mindeps.dot; \
+	  dot -Tpng -o $(buildd_static)/mindeps.png \
+	    $(buildd_static)/mindeps.dot; \
+	else true; fi
+	cd $(buildd_static) && ./python ../debian/mincheck.py \
+		minmods.py mindeps.txt
+endif
+	touch stamps/stamp-mincheck
+
+TEST_RESOURCES = all
+ifeq ($(on_buildd),yes)
+  TEST_RESOURCES := $(TEST_RESOURCES),-network,-urlfetch,-bsddb
+endif
+TESTOPTS = -w -l -u$(TEST_RESOURCES)
+#TESTOPTS = -v -l -u$(TEST_RESOURCES)
+TEST_EXCLUDES =
+ifeq ($(on_buildd),yes)
+  TEST_EXCLUDES += test_codecmaps_cn test_codecmaps_hk \
+        test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw \
+        test_normalization test_ossaudiodev
+  ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel powerpc kfreebsd-i386 sparc))
+    TEST_EXCLUDES += test_threading
+  endif
+  ifeq (,$(wildcard $(HOME)))
+    TEST_EXCLUDES += test_site
+  endif
+endif
+ifeq (,$(wildcard /dev/dsp))
+  TEST_EXCLUDES += test_linuxaudiodev test_ossaudiodev
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), armel hppa powerpc))
+  TEST_EXCLUDES += test_multiprocessing
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
+  TEST_EXCLUDES += test_fork1 test_socketserver test_threading test_wait3 test_wait4 test_gdb
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), arm avr32))
+  TEST_EXCLUDES += test_ctypes
+endif
+TEST_EXCLUDES += test_bsddb3
+TEST_EXCLUDES += test_ensurepip
+ifneq (,$(filter $(DEB_HOST_ARCH), arm armel avr32 m68k))
+  ifeq ($(on_buildd),yes)
+    TEST_EXCLUDES += test_compiler
+  endif
+endif
+TEST_EXCLUDES += test_gdb
+# fails on some buildds
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 armel armhf mips mipsel sparc))
+  TEST_EXCLUDES += test_io
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha))
+  TEST_EXCLUDES += test_signal
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
+  TEST_EXCLUDES += test_io test_signal
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386))
+  TEST_EXCLUDES += test_io test_random test_signal test_socket test_socketserver test_ssl \
+	test_threading test_subprocess
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), ia64))
+  TEST_EXCLUDES += test_threading test_subprocess
+endif
+# see http://bugs.python.org/issue25698
+TEST_EXCLUDES += test_cpickle
+ifneq (,$(TEST_EXCLUDES))
+  TESTOPTS += -x $(sort $(TEST_EXCLUDES))
+  ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
+    TESTOPTS_DEBUG := $(TESTOPTS)
+  else
+    TESTOPTS_DEBUG := $(filter-out test_gdb,$(TESTOPTS))
+  endif
+endif
+
+ifneq (,$(wildcard /usr/bin/localedef))
+  SET_LOCPATH = LOCPATH=$(CURDIR)/locales
+endif
+
+stamps/stamp-check:
+ifeq ($(WITHOUT_CHECK),yes)
+	echo "check run disabled for this build" > $(buildd_static)/test_results
+else
+	: # build locales needed by the testsuite
+	rm -rf locales
+	mkdir locales
+	if which localedef >/dev/null 2>&1; then \
+	  sh debian/locale-gen; \
+	fi
+
+	@echo ========== test environment ============
+	@env
+	@echo ========================================
+  ifeq (,$(findstring $(DEB_HOST_ARCH), alpha))
+	( \
+	  echo '#! /bin/sh'; \
+	  echo 'set -x'; \
+	  echo 'export TERM=$${TERM:-dumb}'; \
+	  echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test TESTOPTS="$(TESTOPTS_DEBUG)"'\'; \
+	  echo 'echo DONE'; \
+	) > $(buildd_debug)/run_tests
+	chmod 755 $(buildd_debug)/run_tests
+	@echo "BEGIN test debug"
+	-tmphome=$$(mktemp -d); export HOME=$$tmphome; \
+	  cd $(buildd_debug) && time xvfb-run -a -e xvfb-run.log ./run_tests; \
+	  rm -rf $$tmphome
+	@echo "END test debug"
+  endif
+
+	( \
+	  echo '#! /bin/sh'; \
+	  echo 'set -x'; \
+	  echo 'export TERM=$${TERM:-dumb}'; \
+	  echo 'export $(SET_LOCPATH)'; \
+	  echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" TESTOPTS="$(TESTOPTS)"'\'; \
+	  echo 'echo DONE'; \
+	) > $(buildd_static)/run_tests
+	chmod 755 $(buildd_static)/run_tests
+	@echo "BEGIN test static"
+	-tmphome=$$(mktemp -d); export HOME=$$tmphome; \
+	  cd $(buildd_static) && time xvfb-run -a -e xvfb-run.log ./run_tests; \
+	  rm -rf $$tmphome
+	@echo "END test static"
+
+	( \
+	  echo '#! /bin/sh'; \
+	  echo 'set -x'; \
+	  echo 'export TERM=$${TERM:-dumb}'; \
+	  echo 'export $(SET_LOCPATH)'; \
+	  echo '$(buildd_static)/python $(CURDIR)/debian/script.py test_results '\''make test EXTRA_CFLAGS="$(EXTRA_OPT_CFLAGS)" TESTOPTS="$(TESTOPTS)"'\'; \
+	  echo 'echo DONE'; \
+	) > $(buildd_shared)/run_tests
+	chmod 755 $(buildd_shared)/run_tests
+	@echo "BEGIN test shared"
+	-tmphome=$$(mktemp -d); export HOME=$$tmphome; \
+	  cd $(buildd_shared) && time xvfb-run -a -e xvfb-run.log ./run_tests; \
+	  rm -rf $$tmphome
+	@echo "END test shared"
+endif
+	cp -p $(buildd_static)/test_results debian/
+	touch stamps/stamp-check
+
+stamps/stamp-pystone:
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	@echo "BEGIN pystone static"
+	cd $(buildd_static) && ./python ../Lib/test/pystone.py
+	cd $(buildd_static) && ./python ../Lib/test/pystone.py
+	@echo "END pystone static"
+	@echo "BEGIN pystone shared"
+	cd $(buildd_shared) \
+		&& LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py
+	cd $(buildd_shared) \
+		&& LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. ./python ../Lib/test/pystone.py
+	@echo "END pystone shared"
+	@echo "BEGIN pystone debug"
+	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
+	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
+	@echo "END pystone debug"
+endif
+	touch stamps/stamp-pystone
+
+#ifeq (,$(filter $(DEB_HOST_ARCH), arm armel avr32 hppa mips mipsel m68k))
+  pybench_options = -C 2 -n 5 -w 4
+#endif
+
+stamps/stamp-pybench:
+ifeq ($(WITHOUT_BENCH),yes)
+	echo "pybench run disabled for this build" > $(buildd_static)/pybench.log
+else
+	@echo "BEGIN pybench static"
+	cd $(buildd_static) \
+	  && time ./python ../Tools/pybench/pybench.py -f run1.pybench $(pybench_options)
+	cd $(buildd_static) \
+	  && ./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench $(pybench_options)
+	@echo "END pybench static"
+	@echo "BEGIN pybench shared"
+	cd $(buildd_shared) \
+	  && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. \
+		./python ../Tools/pybench/pybench.py -f run1.pybench $(pybench_options)
+	cd $(buildd_shared) \
+	  && LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. \
+		./python ../Tools/pybench/pybench.py -f run2.pybench -c run1.pybench $(pybench_options)
+	@echo "END pybench shared"
+	@echo "BEGIN shared/static comparision"
+	$(buildd_static)/python Tools/pybench/pybench.py \
+	  -s $(buildd_static)/run2.pybench -c $(buildd_shared)/run2.pybench \
+	  | tee $(buildd_static)/pybench.log
+	@echo "END shared/static comparision"
+endif
+	touch stamps/stamp-pybench
+
+minimal-test:
+	rm -rf mintest
+	mkdir -p mintest/lib mintest/dynlib mintest/testlib mintest/all-lib
+	cp -p $(buildd_static)/python mintest/
+	cp -p $(foreach i,$(MIN_MODS),Lib/$(i).py) \
+		mintest/lib/
+	cp -a $(foreach i,$(MIN_PACKAGES),Lib/$(i)) \
+		mintest/lib/
+	cp -p $(wildcard $(foreach i,$(MIN_EXTS),$(buildd_static)/build/lib*/$(i).*.so)) \
+		mintest/dynlib/
+	cp -p Lib/unittest.py mintest/lib/
+	cp -pr Lib/test mintest/lib/
+	cp -pr Lib mintest/all-lib
+	cp -p $(buildd_static)/build/lib*/*.so mintest/all-lib/
+	( \
+	  echo "import sys"; \
+	  echo "sys.path = ["; \
+	  echo "    '$(CURDIR)/mintest/lib',"; \
+	  echo "    '$(CURDIR)/mintest/dynlib',"; \
+	  echo "]"; \
+	  cat Lib/test/regrtest.py; \
+	) > mintest/lib/test/mintest.py
+	cd mintest && ./python -E -S lib/test/mintest.py \
+	     -x test_codecencodings_cn test_codecencodings_hk \
+		test_codecencodings_jp test_codecencodings_kr \
+		test_codecencodings_tw test_codecs test_multibytecodec \
+
+stamps/stamp-doc-html:
+	dh_testdir
+	$(MAKE) -C Doc html
+	@mkdir -p stamps
+	touch stamps/stamp-doc-html
+
+build-doc: stamps/stamp-patch stamps/stamp-build-doc
+stamps/stamp-build-doc: stamps/stamp-doc-html
+	touch stamps/stamp-build-doc
+
+control-file:
+	sed -e "s/@PVER@/$(PVER)/g" \
+	    -e "s/@VER@/$(VER)/g" \
+	    -e "s/@PYSTDDEP@/$(PYSTDDEP)/g" \
+	    -e "s/@PRIO@/$(PY_PRIO)/g" \
+	    -e "s/@MINPRIO@/$(PY_MINPRIO)/g" \
+	    -e "s/@bd_qual@/$(bd_qual)/g" \
+	    -e "s/@bd_gcc@/$(bd_gcc)/g" \
+	    -e "s/@bd_dpkgdev@/$(bd_dpkgdev)/g" \
+		debian/control.in \
+	  | $(ma_filter) \
+	  > debian/control.tmp
+ifeq ($(derivative),Ubuntu)
+  ifneq (,$(findstring ubuntu, $(PKGVERSION)))
+	m='Ubuntu Core Developers '; \
+	sed -i "/^Maintainer:/s/\(.*\)/Maintainer: $$m\nXSBC-Original-\1/" \
+	  debian/control.tmp
+  endif
+endif
+	[ -e debian/control ] \
+	  && cmp -s debian/control debian/control.tmp \
+	  && rm -f debian/control.tmp && exit 0; \
+	  mv debian/control.tmp debian/control
+
+
+
+clean: control-file
+	dh_testdir
+	dh_testroot
+	$(MAKE) -f debian/rules unpatch
+	rm -rf stamps .pc
+	rm -f debian/test_results
+
+	$(MAKE) -C Doc clean
+	sed 's/^@/#/' Makefile.pre.in | $(MAKE) -f - srcdir=. distclean
+	rm -rf Lib/test/db_home
+	rm -rf $(buildd_static) $(buildd_shared) $(buildd_debug) $(buildd_shdebug)
+	find -name '*.py[co]' | xargs -r rm -f
+	rm -f Lib/lib2to3/*.pickle
+	rm -rf Lib/plat-$(DEB_HOST_MULTIARCH)
+	rm -rf locales
+	rm -rf $(d)-dbg $(d)-shdbg
+
+	for f in debian/*.in; do \
+	  f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \
+	  if [ $$f2 != debian/control ] && [ $$f2 != debian/source.lintian-overrides ]; then \
+	    rm -f $$f2; \
+	  fi; \
+	done
+	dh_autotools-dev_restoreconfig
+	dh_clean
+
+stamps/stamp-control:
+	: # We have to prepare the various control files
+
+	for f in debian/*.in; do \
+	  f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \
+	  if [ $$f2 != debian/control ]; then \
+	    sed -e "s/@PVER@/$(PVER)/g;s/@VER@/$(VER)/g" \
+		    -e "s/@PRIORITY@/$(PRIORITY)/g" \
+		    -e "s,@SCRIPTDIR@,/$(scriptdir),g" \
+		    -e "s,@INFO@,$(info_docs),g" \
+		    -e "s,@HOST_QUAL@,:$(DEB_HOST_ARCH),g" \
+		  <$$f >$$f2; \
+	  fi; \
+	done
+ifeq ($(DEB_HOST_ARCH_BITS),64)
+	sed -i 's/\(Py_InitModule4[^@]*\)@/\1_64@/' \
+		debian/lib$(PVER).symbols debian/lib$(PVER)-dbg.symbols
+endif
+
+2to3-man:
+	help2man --no-info --version-string=$(VER) --no-discard-stderr \
+	  --name 'Python2 to Python3 converter' \
+	  2to3-$(VER) > debian/2to3-$(VER).1
+
+install: build-arch stamps/stamp-install
+stamps/stamp-install: stamps/stamp-build control-file stamps/stamp-control
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	: # make install into tmp and subsequently move the files into
+	: # their packages' directories.
+	install -d $(d)/usr
+ifeq ($(with_interp),static)
+	$(MAKE) -C $(buildd_static) install DESTDIR=$(CURDIR)/$(d)
+else
+	$(MAKE) -C $(buildd_shared) install DESTDIR=$(CURDIR)/$(d)
+endif
+	mkdir -p $(d)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)
+	mv $(d)/usr/include/$(PVER)/pyconfig.h \
+		$(d)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)/.
+	mv $(d)/usr/bin/python-config.sh $(d)/usr/bin/python$(VER)-config
+	sed -i 's/-O3/-O2/g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \
+		$(d)/usr/bin/python$(VER)-config
+
+	: # fiddle around with the platform directory
+	mkdir -p $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/
+	set -x; echo XXXXXX; \
+	for i in Lib/plat-linux2/*; do \
+	  n=$$(basename $$i); \
+	  if [ ! -f $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/$$n ]; then \
+	    cp -p $$i $(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/; \
+	  fi; \
+	done
+	rm -f $(d)/$(scriptdir)/lib-dynload/*.py
+	cp -p $(buildd_shared)/$(shell cat $(buildd_shared)/pybuilddir.txt)/_sysconfigdata.py \
+		$(d)/$(scriptdir)/.
+	mv $(d)/$(scriptdir)/_sysconfigdata.py \
+		$(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py
+	sed -i 's/ -O3 / -O2 /g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \
+		$(d)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py
+	cp -p debian/_sysconfigdata.py $(d)/$(scriptdir)
+
+	-find $(d)/usr/lib/python$(VER) -name '*_failed*.so'
+	find $(d)/usr/lib/python$(VER) -name '*_failed*.so' | xargs -r rm -f
+
+	test -f $(d)/usr/lib/python$(VER)/lib-dynload/_bsddb.so
+
+	for i in $(d)/$(scriptdir)/lib-dynload/*.so; do \
+	  b=$$(basename $$i .so); \
+	  d=$${b}.$(DEB_HOST_MULTIARCH).so; \
+	  mv $$i $(d)/$(scriptdir)/lib-dynload/$$d; \
+	done
+
+	mv $(d)/usr/lib/libpython*.a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+	mv $(d)/usr/lib/python$(VER)/site-packages \
+		$(d)/usr/lib/python$(VER)/dist-packages
+
+	: # remove files, which are not packaged
+	rm -f $(d)/usr/bin/smtpd.py
+	rm -rf $(d)/usr/lib/python$(VER)/ctypes/macholib
+	rm -f $(d)/$(scriptdir)/plat-*/regen
+	rm -f $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python.pc
+	rm -f $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python2.pc
+	rm -f $(d)/usr/bin/python2{,-config}
+	rm -f $(d)/usr/share/man/man1/python.1
+	rm -f $(d)/usr/share/man/man1/python2{,-config}.1
+	rm -f $(d)/$(scriptdir)/lib2to3/*.pickle
+
+	if [ -d $(d)/$(scriptdir)/ensurepip/_bundled ]; then \
+	  echo "don't ship the prebuilt ensurepip/_bundled wheels."; \
+	  rm -rf $(d)/$(scriptdir)/ensurepip/_bundled; \
+	fi
+
+	: # cannot build it, zlib maintainer won't provide a mingw build
+	find $(d) -name 'wininst*.exe' | xargs -r rm -f
+
+	: # fix some file permissions
+	chmod a-x $(d)/$(scriptdir)/{fractions,lib-tk/Tix}.py
+
+	: # move manpages to new names
+	if [ -d $(d)/usr/man/man1 ]; then \
+	    mkdir -p $(d)/usr/share/man; \
+	    mv $(d)/usr/man/man1/* $(d)/usr/share/man/man1/; \
+	    rm -rf $(d)/usr/man/; \
+	fi
+	cp -p debian/pydoc.1 $(d)/usr/share/man/man1/pydoc$(VER).1
+
+	: # Symlinks to /usr/bin for some tools
+	ln -sf ../lib/python$(VER)/pdb.py $(d)/usr/bin/pdb$(VER)
+	cp -p debian/pdb.1 $(d)/usr/share/man/man1/pdb$(VER).1
+
+	: # versioned install only
+	rm -f $(d)/usr/bin/python-config
+
+	mv $(d)/usr/bin/2to3 $(d)/usr/bin/2to3-$(VER)
+	cp debian/2to3-$(VER).1 $(d)/usr/share/man/man1/2to3-$(VER).1
+
+#	: # remove the bsddb stuff
+#	rm -rf $(d)/$(scriptdir)/bsddb
+#	rm -f $(d)/$(scriptdir)/lib-dynload/_bsddb.so
+
+	: # Remove version information from the egg-info file
+	mv $(d)/$(scriptdir)/lib-dynload/Python-$(VER)*.egg-info \
+		$(d)/$(scriptdir)/lib-dynload/Python-$(VER).egg-info
+
+	dh_installdirs -p$(p_lib) \
+		usr/lib/$(DEB_HOST_MULTIARCH) \
+		$(scriptdir)/config-$(DEB_HOST_MULTIARCH) \
+		usr/share/doc
+	: # install the shared library
+	cp -p $(buildd_shared)/libpython$(VER).so.1.0 \
+		$(d_lib)/usr/lib/$(DEB_HOST_MULTIARCH)/
+	dh_link -p$(p_lib) \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1.0 \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1 \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so.1 \
+		/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)/libpython$(VER).so
+
+	ln -sf $(p_base) $(d_lib)/usr/share/doc/$(p_lib)
+
+	ln -sf libpython$(VER).so.1 $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).so
+
+ifeq ($(with_interp),shared)
+	: # install the statically linked runtime
+	install -m755 $(buildd_static)/python $(d)/usr/bin/python$(VER)-static
+endif
+
+	mv $(d)/usr/bin/pydoc $(d)/usr/bin/pydoc$(VER)
+	cp -p Tools/i18n/pygettext.py $(d)/usr/bin/pygettext$(VER)
+	cp -p debian/pygettext.1 $(d)/usr/share/man/man1/pygettext$(VER).1
+
+	: # install the Makefile of the shared python build
+	sed -e '/^OPT/s,-O3,-O2,' \
+	    -e 's/$(LTO_CFLAGS)//g' \
+	    -e 's,^RUNSHARED *=.*,RUNSHARED=,' \
+	    -e '/BLDLIBRARY/s/-L\. //' \
+		build-shared/Makefile > $(d)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)/Makefile
+
+	: # Move the binary and the minimal libraries into $(p_lmin).
+	dh_installdirs -p$(p_lmin) \
+		etc/$(PVER) \
+		usr/bin \
+		usr/include/$(PVER) \
+		usr/share/man/man1 \
+		$(scriptdir)/lib-dynload
+	$(dh_compat2) dh_movefiles -p$(p_lmin) --sourcedir=$(d) \
+		$(foreach i,$(MIN_MODS),$(scriptdir)/$(i).py) \
+		$(foreach i,$(MIN_PACKAGES),$(scriptdir)/$(i)) \
+		$(foreach i,$(MIN_ENCODINGS),$(scriptdir)/$(i)) \
+		/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/_sysconfigdata_nd.py \
+		$(scriptdir)/site.py \
+		$(shell cd $(d); for i in $(MIN_EXTS); do \
+			test -e $(scriptdir)/lib-dynload/$$i.so \
+			  && echo $(scriptdir)/lib-dynload/$$i.so; \
+		  done; true)
+
+	: # Move the binary and the minimal libraries into $(p_min).
+	dh_installdirs -p$(p_min) \
+		usr/bin \
+		usr/share/man/man1
+	$(dh_compat2) dh_movefiles -p$(p_min) --sourcedir=$(d) \
+		usr/bin/python$(VER) \
+		usr/share/man/man1/python$(VER).1
+
+	: # Install sitecustomize.py.
+	cp -p debian/sitecustomize.py $(d_lmin)/etc/$(PVER)/
+	dh_link -p$(p_lmin) /etc/$(PVER)/sitecustomize.py \
+		/$(scriptdir)/sitecustomize.py
+
+	: # Move the static library and the header files into $(p_ldev).
+#	mv $(d)/usr/share/include/python$(VER)/* $(d)/usr/include/python$(VER)/.
+#	rm -rf $(d)/usr/share/include
+
+	cp $(d)/usr/bin/python$(VER)-config $(d)/usr/bin/$(DEB_HOST_MULTIARCH)-python$(VER)-config
+	dh_installdirs -p$(p_ldev) \
+		usr/bin \
+		$(scriptdir) \
+		usr/include \
+		usr/share/man/man1
+
+	$(dh_compat2) dh_movefiles -p$(p_ldev) --sourcedir=$(d) \
+		usr/bin/$(DEB_HOST_MULTIARCH)-python$(VER)-config \
+		usr/lib/python$(VER)/config-$(DEB_HOST_MULTIARCH) \
+		usr/include \
+		usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).{a,so} \
+		usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)*.pc
+
+	sed 's/@subdir@/$(PVER)/;s/@header@/pyconfig.h/' \
+		debian/multiarch.h.in > $(d_ldev)/usr/include/$(PVER)/pyconfig.h
+
+	cp -p debian/python-config.1 \
+		$(d_ldev)/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-python$(VER)-config.1
+
+ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config \
+		$(d_ldev)/usr/bin/$(DEB_HOST_GNU_TYPE)-$(PVER)-config
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \
+		$(d_ldev)/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-$(PVER)-config.1.gz
+endif
+
+	sed -i \
+	    -e '/^Cflags:/s,$$, -I$${includedir}/$(DEB_HOST_MULTIARCH)/python$(VER),' \
+	    -e '/^libdir=/d;s/-L\$${libdir} *//' \
+		$(d_ldev)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER).pc
+
+	dh_link -p$(p_ldev) \
+		/usr/lib/$(PVER)/config-$(DEB_HOST_MULTIARCH)/libpython$(VER).a \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER).a
+
+	cp -p $(buildd_shared)/libpython$(VER)-pic.a \
+		$(d_ldev)/usr/lib/python$(VER)/config-$(DEB_HOST_MULTIARCH)/
+
+	: # Move the static library and the header files into $(p_dev).
+	dh_installdirs -p$(p_dev) \
+		usr/share/doc/python$(VER)/$(DEB_HOST_MULTIARCH) \
+		usr/share/man/man1 \
+		$(scriptdir) \
+		$(scriptdir)/doc/html
+
+	cp -p Misc/HISTORY Misc/README.valgrind Misc/gdbinit \
+		debian/README.maintainers \
+		$(d_dev)/usr/share/doc/python$(VER)/
+	cp -p	debian/test_results $(buildd_static)/pybench.log \
+		$(d_dev)/usr/share/doc/python$(VER)/$(DEB_HOST_MULTIARCH)/
+
+	$(dh_compat2) dh_movefiles -p$(p_dev) --sourcedir=$(d) \
+		usr/bin/python$(VER)-config \
+		usr/lib/python$(VER)/distutils/command/wininst-*.exe
+
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config $(d_dev)/usr/bin/$(PVER)-config
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz $(d_dev)/usr/share/man/man1/$(PVER)-config.1.gz
+
+ifeq ($(with_tk),yes)
+	: # Move the Tkinter files into $(p_tk).
+	dh_installdirs -p$(p_tk) \
+		$(scriptdir) \
+		usr/lib/python$(VER)/lib-dynload
+	$(dh_compat2) dh_movefiles -p$(p_tk) --sourcedir=$(d) \
+		usr/lib/python$(VER)/lib-dynload/_tkinter.so
+endif
+
+ifeq ($(with_gdbm),yes)
+	: # gdbm and dbm modules into $(p_gdbm).
+	dh_installdirs -p$(p_gdbm) \
+		usr/lib/python$(VER)/lib-dynload
+	$(dh_compat2) dh_movefiles -p$(p_gdbm) --sourcedir=$(d) \
+		usr/lib/python$(VER)/lib-dynload/gdbm.so
+endif
+
+	: # The test framework into $(p_lbase)
+	$(dh_compat2) dh_movefiles -p$(p_lbase) --sourcedir=$(d) \
+		$(scriptdir)/test/{regrtest.py,test_support.py,__init__.py,pystone.py}
+
+	: # The complete testsuite into $(p_lbase)
+	$(dh_compat2) dh_movefiles -p$(p_ltst) --sourcedir=$(d) \
+		$(scriptdir)/test \
+		$(scriptdir)/ctypes/test \
+		$(scriptdir)/bsddb/test \
+		$(scriptdir)/email/test \
+		$(scriptdir)/json/tests \
+		$(scriptdir)/sqlite3/test \
+		$(scriptdir)/distutils/tests \
+		$(scriptdir)/lib2to3/tests \
+		$(scriptdir)/unittest/test \
+		$(scriptdir)/lib-tk/test
+
+	: # test_ctypes fails with test_macholib.py installed
+	rm -f $(d_ltst)/$(scriptdir)/ctypes/test/test_macholib.py
+	: # test_bdist_wininst fails, '*.exe' files are not installed
+	rm -f $(d_ltst)/$(scriptdir)/distutils/tests/test_bdist_wininst.py
+
+	: # IDLE
+	mv $(d)/usr/bin/idle $(d)/usr/bin/idle-python$(VER)
+	rm -f $(d)/usr/lib/python$(VER)/idlelib/idle.bat
+	dh_installdirs -p$(p_idle) \
+		usr/bin \
+		usr/share/man/man1
+	$(dh_compat2) dh_movefiles -p$(p_idle) --sourcedir=$(d) \
+		usr/lib/python$(VER)/idlelib \
+		usr/bin/idle-python$(VER)
+	cp -p debian/idle-$(PVER).1 $(d_idle)/usr/share/man/man1/
+
+	: # Move the demos and tools into $(p_exam)'s doc directory
+	dh_installdirs -p$(p_exam) \
+		usr/share/doc/python$(VER)/examples
+
+	cp -rp Demo Tools $(d_exam)/usr/share/doc/python$(VER)/examples/
+	rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Demo/sgi
+	: # IDLE is in its own package:
+	rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/idle
+	: # XXX: We don't need rgb.txt, we'll use our own:
+	rm -rf $(d_exam)/usr/share/doc/python$(VER)/examples/Tools/pynche/X
+
+	: # XXX: Some files in upstream Demo and Tools have strange
+	: # exec permissions, make lintian glad:
+	-chmod 644 $(d_tk)/$(scriptdir)/lib-tk/Tix.py
+	-chmod 644 $(d)/$(scriptdir)/runpy.py
+
+	cd $(d_exam)/usr/share/doc/python$(VER)/examples && chmod 644 \
+	  Demo/{classes/*.py*,comparisons/patterns} \
+	  Demo/{rpc/test,threads/*.py*,md5test/*} \
+	  Demo/pdist/{client.py,cmdfw.py,cmptree.py,cvslib.py,cvslock.py,FSProxy.py,mac.py,rcsclient.py,rcslib.py,security.py,server.py,sumtree.py} \
+	  Demo/scripts/morse.py \
+	  Demo/sockets/{broadcast.py,ftp.py,mcast.py,radio.py} \
+	  Demo/tix/{bitmaps/{tix.gif,*x[pb]m*},samples/*.py} \
+	  Demo/tkinter/guido/{AttrDialog.py,hanoi.py,hello.py,imagedraw.py,imageview.py,listtree.py,ManPage.py,ShellWindow.py,wish.py} \
+	  Tools/scripts/pydocgui.pyw \
+	  Tools/scripts/mailerdaemon.py
+	rm -f $(d_exam)/usr/share/doc/python$(VER)/examples/Demo/scripts/newslist.*
+
+	: # Replace all '#!' calls to python with $(PY_INTERPRETER)
+	: # and make them executable
+	for i in `find debian -mindepth 3 -type f ! -name '*.dpatch'`; do \
+	  sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \
+		$$i > $$i.temp; \
+	  if cmp --quiet $$i $$i.temp; then \
+	    rm -f $$i.temp; \
+	  else \
+	    mv -f $$i.temp $$i; \
+	    chmod 755 $$i; \
+	    echo "fixed interpreter: $$i"; \
+	  fi; \
+	done
+
+	: # Move the docs into $(p_base)'s /usr/share/doc/$(PVER) directory,
+	: # all other packages only have a copyright file.
+	dh_installdocs -p$(p_base) \
+		README Misc/NEWS Misc/ACKS
+	ln -sf NEWS.gz $(d_base)/usr/share/doc/$(p_base)/changelog.gz
+	dh_installdocs --all -N$(p_base) -N$(p_dev) -N$(p_dbg) -N$(p_lib) debian/README.Debian
+
+	: # IDLE has its own changelogs, docs...
+	dh_installchangelogs -p$(p_idle) Lib/idlelib/ChangeLog
+	dh_installdocs -p$(p_idle) Lib/idlelib/{NEWS,README,TODO,extend}.txt
+
+	mkdir -p $(d_idle)/usr/share/applications
+	cp -p debian/idle.desktop \
+		$(d_idle)/usr/share/applications/idle-$(PVER).desktop
+
+	: # those packages have own README.Debian's
+	install -m 644 -p debian/README.$(p_base) \
+		$(d_base)/usr/share/doc/$(PVER)/README.Debian
+	install -m 644 -p debian/README.$(p_idle) \
+		$(d_idle)/usr/share/doc/$(p_idle)/README.Debian
+ifeq ($(with_tk),yes)
+	cp -p debian/README.Tk $(d_tk)/usr/share/doc/$(p_tk)/
+endif
+
+	: # library files into $(p_lbase)
+	dh_installdirs -p$(p_lbase) \
+		usr/lib
+	dh_movefiles -p$(p_lbase) \
+		usr/lib/python$(VER)
+
+	: # The rest goes into $(p_base)
+	mkdir -p $(d)/usr/lib/python$(VER)/dist-packages
+	(cd $(d) && tar cf - .) | (cd $(d_base) && tar xpf -)
+	sh debian/dh_rmemptydirs -p$(p_base)
+	rm -f $(d_base)/usr/bin/python
+
+	: # install egg-info for arparse
+	install -m 644 debian/argparse.egg-info $(d_lbase)/$(scriptdir)/
+
+	: # Install menu icon
+	dh_installdirs -p$(p_base) usr/share/pixmaps
+	cp -p debian/pylogo.xpm $(d_base)/usr/share/pixmaps/$(PVER).xpm
+
+	: # generate binfmt file
+	mkdir -p $(d_min)/usr/share/binfmts
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	$(buildd_static)/python debian/mkbinfmt.py $(PVER) \
+		> $(d_min)/usr/share/binfmts/$(PVER)
+else
+	$(PVER) debian/mkbinfmt.py $(PVER) > $(d_min)/usr/share/binfmts/$(PVER)
+endif
+
+	: # desktop entry
+	mkdir -p $(d_base)/usr/share/applications
+	cp -p debian/$(PVER).desktop \
+		$(d_base)/usr/share/applications/$(PVER).desktop
+
+	: # remove some things
+	-find debian -name .cvsignore | xargs rm -f
+	-find debian -name '*.py[co]' | xargs rm -f
+
+	: # remove empty directories, when all components are in place
+	-find debian ! -name lib-dynload -type d -empty -delete
+
+	: # install debug package
+	rm -rf $(d)-dbg $(d)-shdbg
+	: # need some files from the shared build
+	$(MAKE) -C $(buildd_shdebug) install DESTDIR=$(CURDIR)/$(d)-shdbg
+	$(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg
+	mv $(d)-dbg/usr/lib/libpython*.a $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/
+	mv $(d)-shdbg/$(scriptdir)/_sysconfigdata.py \
+		$(d)-shdbg/$(scriptdir)/_sysconfigdata_d.py
+
+	for i in $(d)-dbg/$(scriptdir)/lib-dynload/*_d.so; do \
+	  b=$$(basename $$i _d.so); \
+	  d=$${b}.$(DEB_HOST_MULTIARCH)_d.so; \
+	  mv $$i $(d)-dbg/$(scriptdir)/lib-dynload/$$d; \
+	done
+	for i in $(d)-shdbg/$(scriptdir)/lib-dynload/*_d.so; do \
+	  b=$$(basename $$i _d.so); \
+	  d=$${b}.$(DEB_HOST_MULTIARCH)_d.so; \
+	  mv $$i $(d)-shdbg/$(scriptdir)/lib-dynload/$$d; \
+	done
+
+	dh_installdirs -p$(p_ldbg) \
+		usr/bin \
+		usr/share/man/man1 \
+		$(scriptdir)/lib-dynload \
+		$(scriptdir)/plat-$(DEB_HOST_MULTIARCH) \
+		usr/include/$(PVER)_d \
+		usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)_d \
+		usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+
+	cp -p $(d)-shdbg/$(scriptdir)/lib-dynload/*.so \
+		$(d_ldbg)/$(scriptdir)/lib-dynload/
+	cp -p $(buildd_shdebug)/libpython$(VER)_d.so.1.0 \
+		$(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/
+	dh_link -p$(p_ldbg) \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1.0 \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1 \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so.1 \
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so
+	sed -e '/^Libs:/s,-lpython$(VER),-lpython$(VER)_d,' \
+	    -e '/^Cflags:/s,python$(VER),python$(VER)_d,' \
+	    -e '/^Cflags:/s,$$, -I$${includedir}/$(DEB_HOST_MULTIARCH)/python$(VER)_d,' \
+	    -e '/^libdir=/d;s/-L\$${libdir} *//' \
+		$(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER).pc \
+		> $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)-dbg.pc
+
+	: # in $(p_ldbg), prefix python-config with triplets
+	cp $(d)-shdbg/usr/bin/python-config.sh \
+		$(d_ldbg)/usr/bin/$(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \
+		$(d_ldbg)/usr/share/man/man1/$(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config.1.gz
+ifneq ($(DEB_HOST_MULTIARCH),$(DEB_HOST_GNU_TYPE))
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config \
+		$(d_ldbg)/usr/bin/$(DEB_HOST_GNU_TYPE)-$(PVER)-dbg-config
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz \
+		$(d_ldbg)/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-$(PVER)-dbg-config.1.gz
+endif
+
+	dh_installdirs -p$(p_dbg) \
+		usr/bin \
+		$(scriptdir)/lib-dynload \
+		usr/share/man/man1 \
+		usr/share/doc/$(p_base)
+
+	cp -p Misc/SpecialBuilds.txt $(d_dbg)/usr/share/doc/$(p_base)/
+	cp -p debian/$(PVER)-dbg.README.Debian \
+		$(d_dbg)/usr/share/doc/$(p_base)/README.debug
+	cp -p $(buildd_debug)/python $(d_dbg)/usr/bin/$(PVER)-dbg
+	cp -p $(d)-shdbg/usr/bin/python-config.sh \
+		$(d_dbg)/usr/bin/$(PVER)-dbg-config
+#	cp -p $(buildd_debug)/build/lib*/*_d.so \
+		$(d_dbg)/$(scriptdir)/lib-dynload/
+	cp -p $(d)-shdbg/$(scriptdir)/_sysconfigdata_d.py \
+		$(d_ldbg)/$(scriptdir)/plat-$(DEB_HOST_MULTIARCH)/
+ifneq ($(with_gdbm),yes)
+	rm -f $(d_ldbg)/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH)_d.so
+	rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH).so
+endif
+ifneq ($(with_tk),yes)
+	rm -f $(d_ldbg)/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH)_d.so
+	rm -f $(d_dbg)/usr/lib/debug/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH).so
+endif
+#	rm -f $(d_dbg)/$(scriptdir)/lib-dynload/_bsddb_d.so
+
+	cp -a $(d)-dbg/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d \
+		 $(d_ldbg)/$(scriptdir)/
+	ln -sf ../../$(DEB_HOST_MULTIARCH)/libpython$(VER)_d.so \
+		$(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER)_d.so
+	ln -sf libpython$(VER)_d.so \
+		$(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER).so
+	ln -sf libpython$(VER)_d.a \
+		$(d_ldbg)/$(scriptdir)/config-$(DEB_HOST_MULTIARCH)_d/libpython$(VER).a
+
+	for i in $(d_ldev)/usr/include/$(PVER)/*; do \
+	  i=$$(basename $$i); \
+	  case $$i in pyconfig.h) continue; esac; \
+	  ln -sf ../$(PVER)/$$i $(d_ldbg)/usr/include/$(PVER)_d/$$i; \
+	done
+	cp -p $(buildd_debug)/pyconfig.h $(d_ldbg)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)_d/
+	sed 's/@subdir@/$(PVER)_d/;s/@header@/pyconfig.h/' \
+		debian/multiarch.h.in > $(d_ldbg)/usr/include/$(PVER)_d/pyconfig.h
+	ln -sf $(PVER).1.gz $(d_dbg)/usr/share/man/man1/$(PVER)-dbg.1.gz
+	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-dbg-config \
+		$(d_dbg)/usr/bin/$(PVER)-dbg-config
+	ln -sf $(PVER)-config.1.gz $(d_dbg)/usr/share/man/man1/$(PVER)-dbg-config.1.gz
+
+	for i in debian/*.overrides; do \
+	  b=$$(basename $$i .overrides); \
+	  install -D -m 644 $$i debian/$$b/usr/share/lintian/overrides/$$b; \
+	done
+
+	touch stamps/stamp-install
+
+# Build architecture-independent files here.
+binary-indep: build-indep install stamps/stamp-control
+	dh_testdir -i
+	dh_testroot -i
+
+	: # $(p_doc) package
+	dh_installdirs -p$(p_doc) \
+		usr/share/doc/$(p_base) \
+		usr/share/doc/$(p_doc)
+	dh_installdocs -p$(p_doc)
+	cp -a Doc/build/html $(d_doc)/usr/share/doc/$(p_base)/
+	rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/jquery.js
+	rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/underscore.js
+	dh_link -p$(p_doc) \
+		/usr/share/doc/$(p_base)/html \
+			/usr/share/doc/$(p_doc)/html \
+		/usr/share/javascript/jquery/jquery.js \
+			/usr/share/doc/$(p_base)/html/_static/jquery.js \
+		/usr/share/javascript/underscore/underscore.js \
+			/usr/share/doc/$(p_base)/html/_static/underscore.js
+
+	: # devhelp docs
+	$(buildd_static)/python debian/pyhtml2devhelp.py \
+		$(d_doc)/usr/share/doc/$(p_base)/html index.html $(VER) \
+		> $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
+	gzip -9nv $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
+	dh_link -p$(p_doc) \
+		/usr/share/doc/$(p_base)/html /usr/share/devhelp/books/$(PVER)
+
+	for i in $(p_ltst); do \
+	  rm -rf debian/$$i/usr/share/doc/$$i; \
+	  ln -s $(p_lbase) debian/$$i/usr/share/doc/$$i; \
+	done
+
+	dh_installdebconf -i $(dh_args)
+	dh_installexamples -i $(dh_args)
+	-dh_icons -i $(dh_args) || dh_iconcache -i $(dh_args)
+	dh_installchangelogs -i $(dh_args)
+	dh_link -i $(dh_args)
+	dh_compress -i $(dh_args) -X.py -X.cls -X.css -X.txt -X.json -X.js -Xobjects.inv -Xgdbinit
+	dh_fixperms -i $(dh_args)
+
+	: # make python scripts starting with '#!' executable
+	for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \
+	  if head -1 $$i | grep -q '^#!'; then \
+	    chmod 755 $$i; \
+	    echo "make executable: $$i"; \
+	  fi; \
+	done
+	-find $(d_doc) -name '*.txt' -perm 755 -exec chmod 644 {} \;
+
+	dh_installdeb -i $(dh_args)
+	dh_gencontrol -i $(dh_args)
+	dh_md5sums -i $(dh_args)
+	dh_builddeb -i $(dh_args)
+
+# Build architecture-dependent files here.
+binary-arch: build-arch install
+	dh_testdir -a
+	dh_testroot -a
+#	dh_installdebconf -a
+	dh_installexamples -a
+	-dh_icons -a || dh_iconcache -a
+#	dh_installmime -a
+	dh_installchangelogs -a
+	for i in $(p_dev) $(p_dbg); do \
+	  rm -rf debian/$$i/usr/share/doc/$$i; \
+	  ln -s $(p_base) debian/$$i/usr/share/doc/$$i; \
+	done
+	for i in $(p_lbase); do \
+	  rm -rf debian/$$i/usr/share/doc/$$i; \
+	  ln -s $(p_lmin) debian/$$i/usr/share/doc/$$i; \
+	done
+	for i in $(p_ldev) $(p_ldbg) $(p_lib); do \
+	  rm -rf debian/$$i/usr/share/doc/$$i; \
+	  ln -s $(p_lbase) debian/$$i/usr/share/doc/$$i; \
+	done
+	-find debian ! -perm -200 -print -exec chmod +w {} \;
+ifneq ($(with_tk),yes)
+	rm -f $(d_lbase)/$(scriptdir)/lib-dynload/_tkinter.$(DEB_HOST_MULTIARCH).so
+endif
+ifneq ($(with_gdbm),yes)
+	rm -f $(d_lbase)/$(scriptdir)/lib-dynload/gdbm.$(DEB_HOST_MULTIARCH).so
+endif
+
+	find $(d_ldbg) $(d_ldev) -name '*.a' ! -type l \
+		| xargs -n 1 $(DEB_HOST_GNU_TYPE)-objcopy -p --remove-section=.gnu.lto_.*
+	dh_strip -a -N$(p_dbg) -N$(p_ldbg) -Xdebug -Xdbg --dbg-package=$(p_dbg)
+	mkdir -p $(d_dbg)/usr/share/gdb/auto-load/usr/bin
+	cp Tools/gdb/libpython.py $(d_dbg)/usr/share/gdb/auto-load/usr/bin/$(PVER)-gdb.py
+	ln -sf $(PVER)-gdb.py $(d_dbg)/usr/share/gdb/auto-load/usr/bin/$(PVER)-dbg-gdb.py
+	mkdir -p $(d_dbg)/usr/share/gdb/auto-load/usr/lib/$(DEB_HOST_MULTIARCH)
+	ln -sf ../../bin/$(PVER)-gdb.py \
+		$(d_dbg)/usr/share/gdb/auto-load/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PVER).so.1.0-gdb.py
+	ln -sf ../../bin/$(PVER)-gdb.py \
+		$(d_dbg)/usr/share/gdb/auto-load/usr/lib/$(DEB_HOST_MULTIARCH)lib$(PVER)_d.so.1.0-gdb.py
+	dh_link -a
+	dh_compress -a -X.py
+	dh_fixperms -a
+
+	: # make python scripts starting with '#!' executable
+	for i in `find debian -mindepth 3 -type f ! -name '*.dpatch' ! -perm 755`; do \
+	  if head -1 $$i | grep -q '^#!'; then \
+	    chmod 755 $$i; \
+	    echo "make executable: $$i"; \
+	  fi; \
+	done
+
+	dh_makeshlibs -p$(p_lib) -V '$(p_lib)'
+	dh_makeshlibs -p$(p_ldbg) -V '$(p_ldbg)'
+# don't include the following symbols, found in extensions
+# which either can be built as builtin or extension.
+	sed -ri '/^ (_check_|asdl_|fast_save_|init)/d' \
+	  $(d_lib)/DEBIAN/symbols $(d_ldbg)/DEBIAN/symbols
+	dh_shlibdeps -a
+	dep=`sed -n '/^shlibs:Depends/s/[^=]*=\(.*\)/\1/p' $(d_min).substvars | awk -v RS=', ' -v ORS=', ' '/^libc6/ { print }'`; \
+	echo "shlibs:Pre-Depends=$$dep" >> $(d_min).substvars
+	sed -i '/^shlibs:Depends/s/libc6[^,]*[, ]*//g' $(d_min).substvars
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+# rules to patch the unpacked files in the source directory
+# ---------------------------------------------------------------------------
+# various rules to unpack addons and (un)apply patches.
+# 	- patch / apply-patches
+#	- unpatch / reverse-patches
+
+patchdir	= debian/patches
+
+glibc_version := $(shell dpkg -s locales | awk '/^Version:/ {print $$2}')
+broken_utimes := $(shell dpkg --compare-versions $(glibc_version) lt 2.3.5 && echo yes || echo no)
+
+$(patchdir)/series: $(patchdir)/series.in
+	cpp -E \
+	  -D$(derivative) \
+	  $(if $(filter $(broken_utimes),yes),-DBROKEN_UTIMES) \
+	  $(if $(filter $(with_fpectl),yes),-DWITH_FPECTL) \
+	  -Darch_os_$(DEB_HOST_ARCH_OS) -Darch_$(DEB_HOST_ARCH) \
+	  -o - $(patchdir)/series.in \
+	  | egrep -v '^(#.*|$$)' > $(patchdir)/series
+
+patch: stamps/stamp-patch
+stamps/stamp-patch: $(patchdir)/series
+	dh_testdir
+	uname -a
+	@echo USER=$$USER, LOGNAME=$$LOGNAME
+	QUILT_PATCHES=$(patchdir) quilt push -a || test $$? = 2
+	rm -rf autom4te.cache configure
+	autoconf
+	mkdir -p stamps
+	echo ""; echo "Patches applied in this version:" > stamps/pxx
+	for i in $$(cat $(patchdir)/series); do \
+	  echo ""; echo "$$i:"; \
+	  sed -n 's/^# *DP: */  /p' $(patchdir)/$$i; \
+	done >> stamps/pxx
+	mv stamps/pxx $@
+
+	dh_autotools-dev_updateconfig
+
+	: # don't build pgen for cross builds, adjust timestamps
+	touch Parser/acceler.c Parser/grammar1.c Parser/listnode.c \
+	  Parser/node.c Parser/parser.c Parser/parsetok.c Parser/bitset.c \
+	  Parser/metagrammar.c Parser/firstsets.c Parser/grammar.c \
+	  Parser/pgen.c
+	touch Objects/obmalloc.c Python/mysnprintf.c Python/pyctype.c \
+	  Parser/tokenizer_pgen.c Parser/printgrammar.c Parser/pgenmain.c
+	@sleep 0.1
+	touch Grammar/Grammar 
+	@sleep 0.1
+	touch Include/graminit.h
+	@sleep 0.1
+	touch Python/graminit.c
+	ln -sf site-packages Lib/dist-packages
+
+reverse-patches: unpatch
+unpatch:
+	QUILT_PATCHES=$(patchdir) quilt pop -a -R || test $$? = 2
+	rm -f stamps/stamp-patch $(patchdir)/series
+	rm -rf configure autom4te.cache
+	rm -f Lib/dist-packages
+
+update-patches: $(patchdir)/series
+	export QUILT_PATCHES=$(patchdir); \
+	export QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"; \
+	export QUILT_DIFF_ARGS="--no-timestamps --no-index -pab"; \
+	while quilt push; do quilt refresh; done
+
+binary: binary-indep binary-arch
+
+.NOTPARALLEL:
+.PHONY: control-file configure build clean binary-indep binary-arch binary install
+
+# Local Variables:
+# mode: makefile
+# end:
--- python2.7-2.7.12.orig/debian/script.py
+++ python2.7-2.7.12/debian/script.py
@@ -0,0 +1,61 @@
+#! /usr/bin/python
+
+# Copyright (C) 2012 Colin Watson .
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject
+# to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+"""Trivial script(1) workalike, but without reading from standard input."""
+
+import os
+import pty
+import select
+import sys
+
+filename = sys.argv[1]
+command = sys.argv[2]
+
+pid, master = pty.fork()
+if pid == 0:  # child
+    os.execlp("sh", "sh", "-c", command)
+
+# parent
+with open(filename, "w") as logfile:
+    try:
+        while True:
+            rfds, _, _ = select.select([master], [], [])
+            if master in rfds:
+                data = os.read(master, 65536)
+                os.write(1, data)
+                logfile.write(data)
+                logfile.flush()
+    except (IOError, OSError):
+        pass
+
+pid, status = os.wait()
+returncode = 0
+if os.WIFSIGNALED(status):
+    returncode = -os.WTERMSIG(status)
+elif os.WIFEXITED(status):
+    returncode = os.WEXITSTATUS(status)
+else:
+    # Should never happen
+    raise RuntimeError("Unknown child exit status!")
+os.close(master)
+sys.exit(returncode)
--- python2.7-2.7.12.orig/debian/sitecustomize.py.in
+++ python2.7-2.7.12/debian/sitecustomize.py.in
@@ -0,0 +1,7 @@
+# install the apport exception handler if available
+try:
+    import apport_python_hook
+except ImportError:
+    pass
+else:
+    apport_python_hook.install()
--- python2.7-2.7.12.orig/debian/source.lintian-overrides
+++ python2.7-2.7.12/debian/source.lintian-overrides
@@ -0,0 +1,11 @@
+# this is conditional in the rules file
+python2.7 source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~)
+
+# generated during the build
+python2.7 source: quilt-build-dep-but-no-series-file
+
+# doesn't support any newer versions
+python2.7 source: build-depends-on-versioned-berkeley-db
+
+# using the system libffi
+python2.7 source: outdated-autotools-helper-file
--- python2.7-2.7.12.orig/debian/source.lintian-overrides.in
+++ python2.7-2.7.12/debian/source.lintian-overrides.in
@@ -0,0 +1,11 @@
+# this is conditional in the rules file
+@PVER@ source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~)
+
+# generated during the build
+@PVER@ source: quilt-build-dep-but-no-series-file
+
+# doesn't support any newer versions
+@PVER@ source: build-depends-on-versioned-berkeley-db
+
+# using the system libffi
+@PVER@ source: outdated-autotools-helper-file
--- python2.7-2.7.12.orig/debian/source/format
+++ python2.7-2.7.12/debian/source/format
@@ -0,0 +1 @@
+1.0
--- python2.7-2.7.12.orig/debian/tests/control
+++ python2.7-2.7.12/debian/tests/control
@@ -0,0 +1,19 @@
+Tests: testsuite
+Depends: build-essential, locales, python2.7-dev, libpython2.7-testsuite, python-gdbm
+# test_zipfile wants to write
+Restrictions: needs-root
+
+Tests: testsuite-dbg
+Depends: build-essential, locales, python2.7-dev, python2.7-dbg, libpython2.7-testsuite, python-gdbm-dbg
+# test_zipfile wants to write
+Restrictions: needs-root
+
+Tests: failing-tests
+Depends: build-essential, locales, python2.7-dev, libpython2.7-testsuite, python-gdbm
+# test_zipfile wants to write
+Restrictions: needs-root allow-stderr
+
+Tests: failing-tests-dbg
+Depends: build-essential, locales, python2.7-dev, python2.7-dbg, libpython2.7-testsuite, python-gdbm-dbg
+# test_zipfile wants to write
+Restrictions: needs-root allow-stderr
--- python2.7-2.7.12.orig/debian/tests/failing-tests
+++ python2.7-2.7.12/debian/tests/failing-tests
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(whoami)" = root ]; then
+  if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then
+    su_user="$SUDO_USER"
+  else
+    su_user=nobody
+  fi
+
+  if [ -e /etc/default/apport ]; then
+    # stop apport
+    service apport stop 2>/dev/null || true
+    sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null
+  fi
+fi
+
+tmphome=$ADTTMP/home
+mkdir -p $tmphome
+if [ -n "$su_user" ]; then
+  chmod go+rx $ADTTMP
+  chown $su_user:nogroup $tmphome
+fi
+ls -la $ADTTMP
+
+# no root access needed after this point
+
+debian_dir=$(dirname $(dirname $0))
+
+export LOCPATH=$(pwd)/locales
+sh $debian_dir/locale-gen
+
+export LANG=C
+
+arch=$(dpkg --print-architecture)
+vendor=$(dpkg-vendor --query Vendor)
+
+TESTPYTHON="python2.7 -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py"
+TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle"
+TESTEXCLUSIONS=
+
+# test_cpickle: starts to fail with 2.7.11, see http://bugs.python.org/issue25698
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_cpickle"
+
+# test_curses: error: copywin() returned ERR
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses"
+
+# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils"
+
+# test_gdb: not run for the optimized build
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_gdb"
+
+# test_threading_local: fails in the Debian CI environment, but even
+# succeeds there when re-run. See
+# http://ci.debian.net/data/packages/unstable/amd64/p/python2.7/20141121_061940.autopkgtest.log.gz
+case "$vendor" in Debian)
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_threading_local"
+esac
+
+# test_zipfile: Issue 17753, requires write access to test and email.test
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+
+if [ "$su_user" = nobody ]; then
+  log=/dev/null
+else
+  log=testsuite.log
+fi
+
+# run some tests separately in it's own run. These succeed locally,
+# but fail on the test setup.
+SEPARATE_TESTS=
+case "$arch" in
+    amd64)
+	;;
+    i386)
+	SEPARATE_TESTS="$SEPARATE_TESTS test_io"
+	;;
+esac
+
+script=$debian_dir/script.py
+
+echo "Running the failing tests with the standard interpreter:"
+progressions=
+for tst in $TESTEXCLUSIONS; do
+  if [ -f "$script" ]; then
+    cmd="HOME=$tmphome python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
+  else
+    cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst"
+  fi
+
+  echo "Running $tst ..."
+  if [ "$(whoami)" = root ]; then
+    echo "su -s /bin/sh -c $cmd $su_user"
+    if su -s /bin/sh -c "$cmd" $su_user; then
+      progressions="$progressions $tst"
+    else
+      :
+    fi
+  else
+    echo "$cmd"
+    if eval $cmd; then
+      progressions="$progressions $tst"
+    else
+      :
+    fi
+  fi
+done
+
+if [ -n "$progressions" ]; then
+  echo "Tests run: $TESTEXCLUSIONS"
+  echo "Progressions:$progressions"
+fi
+
+exit 0
--- python2.7-2.7.12.orig/debian/tests/failing-tests-dbg
+++ python2.7-2.7.12/debian/tests/failing-tests-dbg
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(whoami)" = root ]; then
+  if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then
+    su_user="$SUDO_USER"
+  else
+    su_user=nobody
+  fi
+
+  if [ -e /etc/default/apport ]; then
+    # stop apport
+    service apport stop 2>/dev/null || true
+    sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null
+  fi
+fi
+
+tmphome=$ADTTMP/home
+mkdir -p $tmphome
+if [ -n "$su_user" ]; then
+  chmod go+rx $ADTTMP
+  chown $su_user:nogroup $tmphome
+fi
+ls -la $ADTTMP
+
+# no root access needed after this point
+
+debian_dir=$(dirname $(dirname $0))
+
+export LOCPATH=$(pwd)/locales
+sh $debian_dir/locale-gen
+
+export LANG=C
+
+arch=$(dpkg --print-architecture)
+vendor=$(dpkg-vendor --query Vendor)
+
+tmphome=$ADTTMP/home
+mkdir -p $tmphome
+if [ -n "$su_user" ]; then
+  chown $su_user $tmphome
+fi
+
+TESTPYTHON="python2.7-dbg -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py"
+TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle"
+TESTEXCLUSIONS=
+
+# test_cpickle: starts to fail with 2.7.11, see http://bugs.python.org/issue25698
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_cpickle"
+
+# test_curses: error: copywin() returned ERR
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses"
+
+# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils"
+
+# test_threading_local: fails in the Debian CI environment, but even
+# succeeds there when re-run. See
+# http://ci.debian.net/data/packages/unstable/amd64/p/python2.7/20141121_061940.autopkgtest.log.gz
+case "$vendor" in Debian)
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_threading_local"
+esac
+
+# test_zipfile: Issue 17753, requires write access to test and email.test
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+
+if [ "$su_user" = nobody ]; then
+  log=/dev/null
+else
+  log=testsuite-dbg.log
+fi
+
+script=$debian_dir/script.py
+
+echo "Running the failing tests with the standard interpreter:"
+progressions=
+for tst in $TESTEXCLUSIONS; do
+  if [ -f "$script" ]; then
+    cmd="HOME=$tmphome python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $tst\""
+  else
+    cmd="HOME=$tmphome $TESTPYTHON $TESTOPTS $tst"
+  fi
+
+  echo "Running $tst ..."
+  if [ "$(whoami)" = root ]; then
+    echo "su -s /bin/sh -c $cmd $su_user"
+    if su -s /bin/sh -c "$cmd" $su_user; then
+      progressions="$progressions $tst"
+    else
+      :
+    fi
+  else
+    echo "$cmd"
+    if eval $cmd; then
+      progressions="$progressions $tst"
+    else
+      :
+    fi
+  fi
+done
+
+if [ -n "$progressions" ]; then
+  echo "Tests run: $TESTEXCLUSIONS"
+  echo "Progressions:$progressions"
+fi
+
+exit 0
--- python2.7-2.7.12.orig/debian/tests/testsuite
+++ python2.7-2.7.12/debian/tests/testsuite
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(whoami)" = root ]; then
+  if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then
+    su_user="$SUDO_USER"
+  else
+    su_user=nobody
+  fi
+
+  if [ -e /etc/default/apport ]; then
+    # stop apport
+    service apport stop 2>/dev/null || true
+    sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null
+  fi
+fi
+
+tmphome=$ADTTMP/home
+mkdir -p $tmphome
+if [ -n "$su_user" ]; then
+  chmod go+rx $ADTTMP
+  chown $su_user:nogroup $tmphome
+fi
+ls -la $ADTTMP
+
+# no root access needed after this point
+
+debian_dir=$(dirname $(dirname $0))
+
+export LOCPATH=$(pwd)/locales
+sh $debian_dir/locale-gen
+
+export LANG=C
+
+arch=$(dpkg --print-architecture)
+vendor=$(dpkg-vendor --query Vendor)
+
+TESTPYTHON="python2.7 -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py"
+TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle"
+TESTEXCLUSIONS="-x"
+
+# test_cpickle: starts to fail with 2.7.11, see http://bugs.python.org/issue25698
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_cpickle"
+
+# test_curses: error: copywin() returned ERR
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses"
+
+# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils"
+
+# test_ensurepip: module disabled in Debian
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip"
+
+# test_gdb: not run for the optimized build
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_gdb"
+
+# test_threading_local: fails in the Debian CI environment, but even
+# succeeds there when re-run. See
+# http://ci.debian.net/data/packages/unstable/amd64/p/python2.7/20141121_061940.autopkgtest.log.gz
+case "$vendor" in Debian)
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_threading_local"
+esac
+
+# test_zipfile: Issue 17753, requires write access to test and email.test
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+
+if [ "$su_user" = nobody ]; then
+  log=/dev/null
+else
+  log=testsuite.log
+fi
+
+# run some tests separately in it's own run. These succeed locally,
+# but fail on the test setup.
+SEPARATE_TESTS=
+case "$arch" in
+    amd64)
+	;;
+    i386)
+	SEPARATE_TESTS="$SEPARATE_TESTS test_io"
+	;;
+esac
+
+# several tests fail with configured proxy; we don't need internet access, so
+# unset proxy variables
+EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome"
+
+script=$debian_dir/script.py
+if [ -f "$script" ]; then
+  cmd1="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS $SEPARATE_TESTS\""
+  cmd2="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $SEPARATE_TESTS\""
+else
+  cmd1="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS $SEPARATE_TESTS"
+  cmd2="$EXTRAENV $TESTPYTHON $TESTOPTS $SEPARATE_TESTS"
+fi
+
+echo "Running the python testsuite with the standard interpreter:"
+if [ "$(whoami)" = root ]; then
+  echo "su -s /bin/sh -c $cmd1 $su_user"
+  su -s /bin/sh -c "$cmd1" $su_user
+  if [ -n "$SEPARATE_TESTS" ]; then
+    echo "su -s /bin/sh -c $cmd2 $su_user"
+    su -s /bin/sh -c "$cmd2" $su_user
+  fi
+else
+  echo "$cmd1"
+  eval $cmd1
+  if [ -n "$SEPARATE_TESTS" ]; then
+    echo "$cmd2"
+    eval $cmd2
+  fi
+fi
--- python2.7-2.7.12.orig/debian/tests/testsuite-dbg
+++ python2.7-2.7.12/debian/tests/testsuite-dbg
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(whoami)" = root ]; then
+  if [ -n "$SUDO_USER" ] && getent passwd "$SUDO_USER" > /dev/null; then
+    su_user="$SUDO_USER"
+  else
+    su_user=nobody
+  fi
+
+  if [ -e /etc/default/apport ]; then
+    # stop apport
+    service apport stop 2>/dev/null || true
+    sed -i '/^enabled=/s/=.*/=0/' /etc/default/apport 2>/dev/null
+  fi
+fi
+
+tmphome=$ADTTMP/home
+mkdir -p $tmphome
+if [ -n "$su_user" ]; then
+  chmod go+rx $ADTTMP
+  chown $su_user:nogroup $tmphome
+fi
+ls -la $ADTTMP
+
+# no root access needed after this point
+
+debian_dir=$(dirname $(dirname $0))
+
+export LOCPATH=$(pwd)/locales
+sh $debian_dir/locale-gen
+
+export LANG=C
+
+arch=$(dpkg --print-architecture)
+vendor=$(dpkg-vendor --query Vendor)
+
+TESTPYTHON="python2.7-dbg -E -Wd -3 -tt /usr/lib/python2.7/test/regrtest.py"
+TESTOPTS="-w -uall,-network,-urlfetch,-gui,-xpickle"
+TESTEXCLUSIONS="-x"
+
+# test_cpickle: starts to fail with 2.7.11, see http://bugs.python.org/issue25698
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_cpickle"
+
+# test_curses: error: copywin() returned ERR
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_curses"
+
+# test_distutils: failing tests test_parse_makefile_base, test_parse_makefile_literal_dollar
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_distutils"
+
+# test_ensurepip: module disabled in Debian
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_ensurepip"
+
+# test_threading_local: fails in the Debian CI environment, but even
+# succeeds there when re-run. See
+# http://ci.debian.net/data/packages/unstable/amd64/p/python2.7/20141121_061940.autopkgtest.log.gz
+case "$vendor" in Debian)
+  TESTEXCLUSIONS="$TESTEXCLUSIONS test_threading_local"
+esac
+
+# test_zipfile: Issue 17753, requires write access to test and email.test
+TESTEXCLUSIONS="$TESTEXCLUSIONS test_zipfile"
+
+if [ "$su_user" = nobody ]; then
+  log=/dev/null
+else
+  log=testsuite-dbg.log
+fi
+
+# several tests fail with configured proxy; we don't need internet access, so
+# unset proxy variables
+EXTRAENV="env -u https_proxy -u http_proxy -u no_proxy HOME=$tmphome"
+
+script=$debian_dir/script.py
+if [ -f "$script" ]; then
+  cmd="$EXTRAENV python2.7 $script \"$log\" \"$TESTPYTHON $TESTOPTS $TESTEXCLUSIONS\""
+else
+  cmd="$EXTRAENV $TESTPYTHON $TESTOPTS $TESTEXCLUSIONS"
+fi
+echo "Running the python testsuite with the debug enabled interpreter:"
+if [ "$(whoami)" = root ]; then
+  echo "su -s /bin/sh -c $cmd $su_user"
+  su -s /bin/sh -c "$cmd" $su_user
+else
+  echo "$cmd"
+  eval $cmd
+fi
--- python2.7-2.7.12.orig/debian/watch
+++ python2.7-2.7.12/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/.*\+//,uversionmangle=s/([abcr]+[1-9])$/~$1/ \
+  http://www.python.org/ftp/python/(2\.7\.\d*)/Python-(2\.7[.\dabcr]*)\.tgz