From 071ba05534f1e5f3eee3435214caa2642e3e2c23 Mon Sep 17 00:00:00 2001
From: Jeremy Heiner <scalaprotractor@gmail.com>
Date: Sat, 12 Oct 2013 12:44:32 -0400
Subject: 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>
---
 test/pacman/pmpkg.py  | 2 +-
 test/pacman/pmtest.py | 2 +-
 test/pacman/util.py   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

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 @@ def makepkg(self, path):
             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 @@ def generate(self, pacman):
         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:
-- 
cgit v1.2.3-54-g00ecf