lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Restore python 2 compatibility

Browse Source
This commit is contained in:
Bob Lantz
2018-07-26 13:40:03 -07:00
parent 3e81ea7455
commit afa83cd5ae
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/miniedit.py
+23 -14
View File
@@ -24,19 +24,28 @@ import sys
from optparse import OptionParser from optparse import OptionParser
from subprocess import call from subprocess import call
from tkinter import ( Frame, Label, LabelFrame, Entry, OptionMenu, Checkbutton, if sys.version_info[0] == 2:
Menu, Toplevel, Button, BitmapImage, PhotoImage, Canvas, from Tkinter import ( Frame, Label, LabelFrame, Entry, OptionMenu,
Scrollbar, Wm, TclError, StringVar, IntVar, Checkbutton, Menu, Toplevel, Button, BitmapImage,
E, W, EW, NW, Y, VERTICAL, SOLID, CENTER, PhotoImage, Canvas, Scrollbar, Wm, TclError,
RIGHT, LEFT, BOTH, TRUE, FALSE ) StringVar, IntVar, E, W, EW, NW, Y, VERTICAL, SOLID,
CENTER, RIGHT, LEFT, BOTH, TRUE, FALSE )
from ttk import Notebook
from tkMessageBox import showerror
from subprocess import call
import tkFont
import tkFileDialog
import tkSimpleDialog
import tkFileDialog
else:
from tkinter import ( Frame, Label, LabelFrame, Entry, OptionMenu,
Checkbutton, Menu, Toplevel, Button, BitmapImage,
PhotoImage, Canvas, Scrollbar, Wm, TclError,
StringVar, IntVar, E, W, EW, NW, Y, VERTICAL, SOLID,
CENTER, RIGHT, LEFT, BOTH, TRUE, FALSE )
from tkinter.ttk import Notebook from tkinter.ttk import Notebook
from tkinter.messagebox import showerror from tkinter.messagebox import showerror
from tkinter import font as tkFont from tkinter import font as tkFont
if sys.version_info[0] == 2:
import tkSimpleDialog
import tkFileDialog
elif sys.version_info[0] == 3:
from tkinter import simpledialog as tkSimpleDialog from tkinter import simpledialog as tkSimpleDialog
from tkinter import filedialog as tkFileDialog from tkinter import filedialog as tkFileDialog
@@ -1414,7 +1423,7 @@ class MiniEdit( Frame ):
def convertJsonUnicode(self, text): def convertJsonUnicode(self, text):
"Some part of Mininet don't like Unicode" "Some part of Mininet don't like Unicode"
if isinstance(text, dict): if isinstance(text, dict):
return {self.convertJsonUnicode(key): self.convertJsonUnicode(value) for key, value in text.iteritems()} return {self.convertJsonUnicode(key): self.convertJsonUnicode(value) for key, value in text.items()}
elif isinstance(text, list): elif isinstance(text, list):
return [self.convertJsonUnicode(element) for element in text] return [self.convertJsonUnicode(element) for element in text]
elif isinstance(text, unicode): elif isinstance(text, unicode):
@@ -1841,7 +1850,7 @@ class MiniEdit( Frame ):
# Save Links # Save Links
f.write(" info( '*** Add links\\n')\n") f.write(" info( '*** Add links\\n')\n")
for key,linkDetail in self.links.iteritems(): for key,linkDetail in self.links.items():
tags = self.canvas.gettags(key) tags = self.canvas.gettags(key)
if 'data' in tags: if 'data' in tags:
optsExist = False optsExist = False
@@ -2881,7 +2890,7 @@ class MiniEdit( Frame ):
def buildLinks( self, net): def buildLinks( self, net):
# Make links # Make links
info( "Getting Links.\n" ) info( "Getting Links.\n" )
for key,link in self.links.iteritems(): for key,link in self.links.items():
tags = self.canvas.gettags(key) tags = self.canvas.gettags(key)
if 'data' in tags: if 'data' in tags:
src=link['src'] src=link['src']
@@ -3217,7 +3226,7 @@ class MiniEdit( Frame ):
customs = {} customs = {}
if os.path.isfile( fileName ): if os.path.isfile( fileName ):
execfile( fileName, customs, customs ) execfile( fileName, customs, customs )
for name, val in customs.iteritems(): for name, val in customs.items():
self.setCustom( name, val ) self.setCustom( name, val )
else: else:
raise Exception( 'could not find custom file: %s' % fileName ) raise Exception( 'could not find custom file: %s' % fileName )