diff options
| -rw-r--r-- | geo-replication/syncdaemon/gsyncdconfig.py | 2 | ||||
| -rw-r--r-- | geo-replication/syncdaemon/master.py | 4 | ||||
| -rw-r--r-- | tools/glusterfind/src/conf.py | 2 | 
3 files changed, 4 insertions, 4 deletions
diff --git a/geo-replication/syncdaemon/gsyncdconfig.py b/geo-replication/syncdaemon/gsyncdconfig.py index 67a367c8695..5d439a4c5ee 100644 --- a/geo-replication/syncdaemon/gsyncdconfig.py +++ b/geo-replication/syncdaemon/gsyncdconfig.py @@ -10,7 +10,7 @@  #  try: -    from configparser import ConfigParser as ConfigParser, NoSectionError +    from configparser import ConfigParser, NoSectionError  except ImportError:      from ConfigParser import ConfigParser, NoSectionError  import os diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 3ca60c65a07..f25279ff3a4 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -1037,7 +1037,7 @@ class GMasterChangelogMixin(GMasterCommon):                      # Special case: record mknod as link                      if ty in ['MKNOD']:                          mode = int(ec[2]) -                        if mode & 01000: +                        if mode & 0o1000:                                  # Avoid stat'ing the file as it                                  # may be deleted in the interim                                  st = FreeObject(st_mode=int(ec[2]), @@ -1688,7 +1688,7 @@ class GMasterXsyncMixin(GMasterChangelogMixin):      def is_sticky(self, path, mo):          """check for DHTs linkto sticky bit file"""          sticky = False -        if mo & 01000: +        if mo & 0o1000:              sticky = self.master.server.linkto_check(path)          return sticky diff --git a/tools/glusterfind/src/conf.py b/tools/glusterfind/src/conf.py index 81183d55444..ab766f85c0f 100644 --- a/tools/glusterfind/src/conf.py +++ b/tools/glusterfind/src/conf.py @@ -10,7 +10,7 @@  import os  try: -    import configparser as ConfigParser +    from configparser import ConfigParser  except ImportError:      import ConfigParser  | 
