Merge pull request #23 from xenserver/private/bernhardk/py3-long-inpu…

…t-six

Private/bernhardk/py3 long input six

.pylintrc

@@ -244,7 +244,6 @@ enable=c-extension-no-member,
        hex-method,
        nonzero-method,
        cmp-method,
-       input-builtin,
        round-builtin,
        intern-builtin,
        unichr-builtin,

xen-bugtool

@@ -1591,9 +1591,9 @@ def load_plugins(just_capabilities = False):
             if xmldoc.documentElement.getAttribute("pii") in [PII_NO, PII_YES, PII_MAYBE, PII_IF_CUSTOMIZED]:
                 pii = xmldoc.documentElement.getAttribute("pii")
             if xmldoc.documentElement.getAttribute("min_size") != '':
-                min_size = long(xmldoc.documentElement.getAttribute("min_size"))
+                min_size = int(xmldoc.documentElement.getAttribute("min_size"))
             if xmldoc.documentElement.getAttribute("max_size") != '':
-                max_size = long(xmldoc.documentElement.getAttribute("max_size"))
+                max_size = int(xmldoc.documentElement.getAttribute("max_size"))
             if xmldoc.documentElement.getAttribute("min_time") != '':
                 min_time = int(xmldoc.documentElement.getAttribute("min_time"))
             if xmldoc.documentElement.getAttribute("max_time") != '':
@@ -1720,7 +1720,7 @@ class TarOutput(ArchiveWithTarSubarchives):
         s = os.stat(filename)
         ti.mtime = s.st_mtime
         ti.size = s.st_size
-        self.tf.addfile(ti, file(filename,'rb'))
+        self.tf.addfile(ti, open(filename, "rb"))
 
     def add_path_with_data(self, name, data):
         ti = self._getTi(name)
@@ -1959,7 +1959,7 @@ def prettyDict(d):
 
 
 def yes(prompt):
-    yn = raw_input(prompt)
+    yn = input(prompt)
 
     return len(yn) == 0 or yn.lower()[0] == 'y'