Merge pull request #329 from averma-cb/master

six.py replaced with 1.16 version and replaced readfp with read_file

Author: avanbrunt-cb

bin/cbapi-defense

@@ -48,7 +48,7 @@ def configure(opts):
     token = input("API key: ")
 
     config = RawConfigParser()
-    config.readfp(StringIO('[default]'))
+    config.read_file(StringIO('[default]'))
     config.set("default", "url", url)
     config.set("default", "token", "{0}/{1}".format(token, connector_id))
     config.set("default", "ssl_verify", ssl_verify)

bin/cbapi-protection

@@ -55,7 +55,7 @@ def configure(opts):
     token = input("API token: ")
 
     config = RawConfigParser()
-    config.readfp(StringIO('[default]'))
+    config.read_file(StringIO('[default]'))
     config.set("default", "url", url)
     config.set("default", "token", token)
     config.set("default", "ssl_verify", ssl_verify)

bin/cbapi-psc

@@ -50,7 +50,7 @@ def configure(opts):
     org_key = input("Org Key: ")
 
     config = RawConfigParser()
-    config.readfp(StringIO('[default]'))
+    config.read_file(StringIO('[default]'))
     config.set("default", "url", url)
     config.set("default", "token", "{0}/{1}".format(token, connector_id))
     config.set("default", "org_key", org_key)

bin/cbapi-response

@@ -70,7 +70,7 @@ def configure(opts):
         return 1
 
     config = RawConfigParser()
-    config.readfp(StringIO('[default]'))
+    config.read_file(StringIO('[default]'))
     config.set("default", "url", url)
     config.set("default", "token", token)
     config.set("default", "ssl_verify", ssl_verify)