Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate python scripts to Python3 #124

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user_manual/cli_intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ \section{Running xorpsh in Non-Interactive Mode}
\item Running \xorpsh as part of an ``expect'' script:

\begin{verbatim}
#!/usr/bin/env python
#!/usr/bin/env python2
import time
import sys
import pexpect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ show host os
xorpsh -c "show host os"
</code> The “-c” option can be used more than once to execute multiple commands.
* Running xorpsh as part of an “expect” script: <code>
#!/usr/bin/env python
#!/usr/bin/env python2
import time
import sys
import pexpect
Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xtconf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xtconf.py,v 1.17 2002/03/08 22:57:36 atanu Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xthpconfig.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xthpconfig.py,v 1.9 2002/12/06 03:17:50 pavlin Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xtifset.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xtifset.py,v 1.19 2002/07/03 00:18:58 atanu Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xtparse.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xtparse.py,v 1.7 2002/03/08 22:57:36 atanu Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xtreset.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xtreset.py,v 1.5 2003/07/27 10:34:17 pavlin Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xttable.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xttable.py,v 1.8 2001/11/02 23:57:44 atanu Exp $

Expand Down
2 changes: 1 addition & 1 deletion other/testbed/tools/xtxml.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python2

# $XORP: other/testbed/tools/xtxml.py,v 1.10 2002/03/08 22:57:36 atanu Exp $

Expand Down
2 changes: 1 addition & 1 deletion www/scripts/XorpOrgGenerator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import getopt, re, sys, time

Expand Down
7 changes: 1 addition & 6 deletions xorp/BUILD_NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,8 @@ http://xorp.run.montefiore.ulg.ac.be/latex2wiki/user_manual
More tests need to be written/enabled, but a fair amount of tests
are enabled currently.

To run the internal tests, you must have "bash" and "python" installed.
Note that if the python's executable filename is not "python", then
you would have to create a symbolic link with such name. E.g., execute
as a root:
To run the internal tests, you must have "bash" and "python3" installed.

cd /path/to/python/binary
ln -s python2.4 python

After the code is compiled, you need to run the following command
in the top-level XORP directory:
Expand Down
2 changes: 1 addition & 1 deletion xorp/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if env['enable_bgp']:

if env['enable_ospf']:
subdirs.append('ospf')

if env['enable_rip']:
subdirs.append('rip')

Expand Down
Loading