diff --git a/examples/miniedit.py b/examples/miniedit.py index bb0ec99..c1057c6 100755 --- a/examples/miniedit.py +++ b/examples/miniedit.py @@ -24,6 +24,7 @@ import sys from optparse import OptionParser from subprocess import call +# pylint: disable=import-error if sys.version_info[0] == 2: from Tkinter import ( Frame, Label, LabelFrame, Entry, OptionMenu, Checkbutton, Menu, Toplevel, Button, BitmapImage, @@ -32,11 +33,9 @@ if sys.version_info[0] == 2: 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, @@ -48,6 +47,7 @@ else: from tkinter import font as tkFont from tkinter import simpledialog as tkSimpleDialog from tkinter import filedialog as tkFileDialog +# pylint: enable=import-error import re import json diff --git a/mininet/node.py b/mininet/node.py index 8b6f8cf..3c61393 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -89,7 +89,7 @@ class Node( object ): self.inNamespace = params.get( 'inNamespace', inNamespace ) # Python 3 complains if we don't wait for shell exit - self.waitExited = params.get( 'waitExited', Python3 == True ) + self.waitExited = params.get( 'waitExited', Python3 ) # Stash configuration parameters for future reference self.params = params