summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Heiner <scalaprotractor@gmail.com>2013-10-12 18:44:32 +0200
committerAllan McRae <allan@archlinux.org>2013-10-14 05:01:15 +0200
commit071ba05534f1e5f3eee3435214caa2642e3e2c23 (patch)
tree73dd805484e42cd3e6ecad713b7a1067c35a8843
parent4d24da8cda18cdb1e7a69baec196ad502d4d12de (diff)
downloadpacman-071ba05534f1e5f3eee3435214caa2642e3e2c23.tar.gz
pacman-071ba05534f1e5f3eee3435214caa2642e3e2c23.tar.xz
Use Python's "0o#" octal literal instead of deprecated "0#".
Reported as a compatibility issue by 2to3. Signed-off-by: Jeremy Heiner <ScalaProtractor@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--test/pacman/pmpkg.py2
-rw-r--r--test/pacman/pmtest.py2
-rw-r--r--test/pacman/util.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 9b3147a3..24ef1e2b 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -161,7 +161,7 @@ class pmpkg(object):
if fileinfo["hasperms"]:
info.mode = fileinfo["perms"]
elif fileinfo["isdir"]:
- info.mode = 0755
+ info.mode = 0o755
if fileinfo["isdir"]:
info.type = tarfile.DIRTYPE
tar.addfile(info)
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index d12a5ed2..731a9fc7 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -131,7 +131,7 @@ class pmtest(object):
for sys_dir in sys_dirs:
if not os.path.isdir(sys_dir):
vprint("\t%s" % sys_dir[len(self.root)+1:])
- os.makedirs(sys_dir, 0755)
+ os.makedirs(sys_dir, 0o755)
# Only the dynamically linked binary is needed for fakechroot
shutil.copy("/bin/sh", bindir)
if shell != "bin/sh":
diff --git a/test/pacman/util.py b/test/pacman/util.py
index 14035d76..c1ab390e 100644
--- a/test/pacman/util.py
+++ b/test/pacman/util.py
@@ -84,12 +84,12 @@ def mkfile(base, name, data=""):
path = os.path.join(base, filename)
if info["isdir"]:
if not os.path.isdir(path):
- os.makedirs(path, 0755)
+ os.makedirs(path, 0o755)
return
dir_path = os.path.dirname(path)
if dir_path and not os.path.isdir(dir_path):
- os.makedirs(dir_path, 0755)
+ os.makedirs(dir_path, 0o755)
if info["islink"]:
os.symlink(info["link"], path)
@@ -182,6 +182,6 @@ def mkdir(path):
return
elif os.path.isfile(path):
raise OSError("'%s' already exists and is not a directory" % path)
- os.makedirs(path, 0755)
+ os.makedirs(path, 0o755)
# vim: set ts=4 sw=4 et: