Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Private/bernhardk/py3 long input six #23

Merged
merged 2 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ enable=c-extension-no-member,
hex-method,
nonzero-method,
cmp-method,
input-builtin,
round-builtin,
intern-builtin,
unichr-builtin,
Expand Down
8 changes: 4 additions & 4 deletions xen-bugtool
Original file line number Diff line number Diff line change
Expand Up @@ -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") != '':
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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'

Expand Down