summaryrefslogtreecommitdiffstats
path: root/Doc/faq/windows.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-06 07:12:17 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-06 07:12:17 (GMT)
commit107690c2ff6ad95934b66df2d2566177b7560827 (patch)
treebed014930e5f43b142643b4c0f9b4c33543e5832 /Doc/faq/windows.rst
parentc06f34fa9b089a9211151051236029e6531bd416 (diff)
downloadcpython-107690c2ff6ad95934b66df2d2566177b7560827.zip
cpython-107690c2ff6ad95934b66df2d2566177b7560827.tar.gz
cpython-107690c2ff6ad95934b66df2d2566177b7560827.tar.bz2
Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r76884 | georg.brandl | 2009-12-19 18:35:49 +0100 (Sa, 19 Dez 2009) | 9 lines Merged revisions 76883 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76883 | georg.brandl | 2009-12-19 18:34:32 +0100 (Sa, 19 Dez 2009) | 1 line #7521: remove Py_GetBuildNumber(), which was removed in favor of Py_GetBuildInfo(). ........ ................ r76885 | georg.brandl | 2009-12-19 18:36:20 +0100 (Sa, 19 Dez 2009) | 1 line #7521: remove PyEval_GetRestricted() from the docs. ................ r76887 | georg.brandl | 2009-12-19 18:46:40 +0100 (Sa, 19 Dez 2009) | 9 lines Recorded merge of revisions 76886 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76886 | georg.brandl | 2009-12-19 18:43:33 +0100 (Sa, 19 Dez 2009) | 1 line #7493: review of Design FAQ by Florent Xicluna. ........ ................ r76889 | georg.brandl | 2009-12-19 18:57:51 +0100 (Sa, 19 Dez 2009) | 1 line #7499: Review of Library FAQ by Florent Xicluna. ................ r76890 | georg.brandl | 2009-12-19 18:59:59 +0100 (Sa, 19 Dez 2009) | 1 line #7500: add "Python 3 review needed" comments and fix a few obvious errors. ................ r76895 | georg.brandl | 2009-12-19 19:23:28 +0100 (Sa, 19 Dez 2009) | 1 line #7380: Fix some str/bytearray/bytes issues in uuid docs and implementation. ................
Diffstat (limited to 'Doc/faq/windows.rst')
-rw-r--r--Doc/faq/windows.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 2d701c8..2a19c98 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -8,6 +8,10 @@ Python on Windows FAQ
.. contents::
+.. XXX need review for Python 3.
+ XXX need review for Windows Vista/Seven?
+
+
How do I run a Python program under Windows?
--------------------------------------------
@@ -67,7 +71,7 @@ Python statements or expressions interactively and have them executed or
evaluated while you wait. This is one of Python's strongest features. Check it
by entering a few expressions of your choice and seeing the results::
- >>> print "Hello"
+ >>> print("Hello")
Hello
>>> "Hello" * 3
HelloHelloHello
@@ -507,7 +511,7 @@ Example::
import win32pipe
f = win32pipe.popen('dir /c c:\\')
- print f.readlines()
+ print(f.readlines())
f.close()