osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Start recommending Python 3 on Windows. 

Works fine here, including git-review.

Change-Id: I8580a6b266fba09c711be8984a9f17e02a9f789f
Reviewed-on: https://code.wireshark.org/review/17097
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2016-08-16 16:23:30 -07:00
parent 72a3195c86
commit e3daf4a66d
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
View File

@ -242,19 +242,26 @@ PS$>choco install winflexbison
==== Install Python
Get the Python 2.7 installer from http://python.org/download/[] and install
Python into the default location ('C:\Python27').
Get the Python 3.5 or 2.7 installer from http://python.org/download/[] and
install Python into the default location ('C:\Python35' or 'C:\Python27').
Why is this recommended? Cygwin's Python package doesn't work on some machines,
so the Win32 native package is recommended (and it's faster). Note that Python 3.x isn't currently supported.
Why is this recommended? Cygwin's `/usr/bin/python` is a Cygwin-specific
symbolic link which cannot be run from Windows. The native package is faster
as well.
Alternatively you can install Python using Chocolatey:
----
PS$>choco install python3
----
or
----
PS$>choco install python2
----
Chocolatey installs Python 2 in 'C:\tools\python2' by default.
Chocolatey installs Python in 'C:\tools\python3' and 'C:\tools\python2' by default.
[[ChSetupGit]]

24
docbook/wsdg_src/WSDG_chapter_tools.asciidoc
View File

@ -697,8 +697,8 @@ This section not yet written
Python is an interpreted programming language. The homepage of the Python
project is http://python.org/[]. It is used to generate some source files.
Python 2.5 or later (including Python 3) should work fine but Python 2.7 is
recommended.
Python 2.5 or later (including Python 3) should work fine and Python 3.5 and
2.7 are recommended.
Python is either included or available as a package on most UNIX-like platforms.
Windows packages and source are available at http://python.org/download/[].
@ -707,12 +707,18 @@ a symbolic link, which causes confusion outside Cygwin.
You can also use Chocolatey to install Python:
----
PS:\> choco install Python3
----
or
----
PS:\> choco install Python2
----
Chocolatey installs Python 2 into 'C:\tools\python2' by default. You can
verify your Python version by running
Chocolatey installs Python into 'C:\tools\python3' or 'C:\tools\python2' by
default. You can verify your Python version by running
----
$ python --version
@ -722,18 +728,18 @@ on UNIX and Linux and
----
rem Official package
C:> cd python27
C:Python27> python --version
C:> cd python35
C:Python35> python --version
rem Chocolatey
C:> cd \tools\python2
C:\tools\python2> python --version
C:> cd \tools\python3
C:\tools\python3> python --version
----
on Windows. You should see something like
----
Python 2.7.9
Python 3.5.1
----
Your version string may vary of course.