From: Martin <martin.basti@gmail.com>
Date: Sat, 2 Jul 2016 20:35:31 +0000 (+0200)
Subject: Pylint: examples: fix basestring is not in py3
X-Git-Tag: v1.15.0~40^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c42b263cfd02d1cf5feb511162f8624060d6fa3;p=thirdparty%2Fdnspython.git

Pylint: examples: fix basestring is not in py3
---

diff --git a/examples/zonediff.py b/examples/zonediff.py
index 6afa3628..be038518 100755
--- a/examples/zonediff.py
+++ b/examples/zonediff.py
@@ -192,15 +192,7 @@ The differences shown will be logical differences, not textual differences.
     opts.use_vc = opts.use_git or opts.use_bzr or opts.use_rcs
 
     def _open(what, err):
-        if isinstance(what, basestring):
-            # Open as normal file
-            try:
-                return open(what, 'rb')
-            except:
-                sys.stderr.write(err + "\n")
-                if opts.tracebacks:
-                    traceback.print_exc()
-        else:
+        if isinstance(what, list):
             # Must be a list, open subprocess
             try:
                 proc = subprocess.Popen(what, stdout=subprocess.PIPE)
@@ -212,6 +204,14 @@ The differences shown will be logical differences, not textual differences.
                 sys.stderr.write(err + "\n")
                 if opts.tracebacks:
                     traceback.print_exc()
+        else:
+            # Open as normal file
+            try:
+                return open(what, 'rb')
+            except:
+                sys.stderr.write(err + "\n")
+                if opts.tracebacks:
+                    traceback.print_exc()
 
     if not opts.use_vc and len(args) != 2:
         p.print_help()