Mercurial > hg-stable

diff mercurial/patch.py @ 25658:e93036747902

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
global: mass rewrite to use modern octal syntax Python 2.6 introduced a new octal syntax: "0oXXX", replacing "0XXX". The old syntax is not recognized in Python 3 and will result in a parse error. Mass rewrite all instances of the old octal syntax to the new syntax. This patch was generated by `2to3 -f numliterals -w -n .` and the diff was selectively recorded to exclude changes to "<N>l" syntax conversion, which will be handled separately.
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 23 Jun 2015 22:30:33 -0700
parents c99f9715cc9a
children 328739ea70c3
line wrap: on
line diff
--- a/mercurial/patch.py	Tue Jun 23 14:28:15 2015 -0700
+++ b/mercurial/patch.py	Tue Jun 23 22:30:33 2015 -0700
@@ -288,8 +288,8 @@
         self.binary = False
 
     def setmode(self, mode):
-        islink = mode & 020000
-        isexec = mode & 0100
+        islink = mode & 0o20000
+        isexec = mode & 0o100
         self.mode = (islink, isexec)
 
     def copy(self):
@@ -430,7 +430,7 @@
 
         isexec = False
         try:
-            isexec = self.opener.lstat(fname).st_mode & 0100 != 0
+            isexec = self.opener.lstat(fname).st_mode & 0o100 != 0
         except OSError, e:
             if e.errno != errno.ENOENT:
                 raise