From 3c35096cb24bfebe691e18970a021d82d44cafe6 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Aug 14 2017 11:04:57 +0000
Subject: Fix python3 incompatible syntax


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/ipsilon/providers/openidcp.py b/ipsilon/providers/openidcp.py
index 3bb1c81..aee776b 100644
--- a/ipsilon/providers/openidcp.py
+++ b/ipsilon/providers/openidcp.py
@@ -258,7 +258,7 @@ class Installer(ProviderInstaller):
 
         path = os.path.join(opts['data_dir'], 'openidc')
         if not os.path.exists(path):
-            os.makedirs(path, 0700)
+            os.makedirs(path, 0o700)
 
         keyfile = os.path.join(path, 'openidc.key')
         keyid = int(time.time())
diff --git a/ipsilon/providers/personaidp.py b/ipsilon/providers/personaidp.py
index 6e8216d..265847a 100644
--- a/ipsilon/providers/personaidp.py
+++ b/ipsilon/providers/personaidp.py
@@ -98,7 +98,7 @@ class Installer(ProviderInstaller):
         # Check storage path is present or create it
         path = os.path.join(opts['data_dir'], 'persona')
         if not os.path.exists(path):
-            os.makedirs(path, 0700)
+            os.makedirs(path, 0o700)
 
         keyfile = os.path.join(path, 'persona.key')
         exponent = 0x10001
diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py
index 09bb12a..fbc9d68 100644
--- a/ipsilon/providers/saml2idp.py
+++ b/ipsilon/providers/saml2idp.py
@@ -514,7 +514,7 @@ class Installer(ProviderInstaller):
         # Check storage path is present or create it
         path = os.path.join(opts['data_dir'], 'saml2')
         if not os.path.exists(path):
-            os.makedirs(path, 0700)
+            os.makedirs(path, 0o700)
 
         # Use the same cert for signing and ecnryption for now
         cert = Certificate(path)
diff --git a/ipsilon/tools/files.py b/ipsilon/tools/files.py
index cc1b777..154b496 100644
--- a/ipsilon/tools/files.py
+++ b/ipsilon/tools/files.py
@@ -5,7 +5,7 @@ import pwd
 from string import Template
 
 
-def fix_user_dirs(path, user=None, mode=0700):
+def fix_user_dirs(path, user=None, mode=0o700):
     pw = None
     if user:
         pw = pwd.getpwnam(user)
@@ -15,7 +15,7 @@ def fix_user_dirs(path, user=None, mode=0700):
             target = os.path.join(root, name)
             if pw:
                 os.chown(target, pw.pw_uid, pw.pw_gid)
-            os.chmod(target, mode & 0666)
+            os.chmod(target, mode & 0o666)
         if pw:
             os.chown(root, pw.pw_uid, pw.pw_gid)
         os.chmod(root, mode)