kallithea Changeset - b0c75d6f8f32

Changeset - b0c75d6f8f32

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 6 years ago 2019-11-23 22:17:54
mads@kiilerich.com

Grafted from: bd5412f3641d

py3: use explicit octal literals

From 2to3 numliterals.

5 files changed with 8 insertions and 8 deletions:

kallithea/lib/vcs/backends/hg/changeset.py

kallithea/lib/vcs/nodes.py

kallithea/model/scm.py

kallithea/tests/vcs/test_git.py

kallithea/tests/vcs/test_nodes.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -237,27 +237,27 @@ class MercurialChangeset(BaseChangeset): @@
         """
         returns a dictionary with submodule information from substate file
         of hg repository
         """
         return self._ctx.substate
     def get_file_mode(self, path):
         """
         Returns stat mode of the file at the given ``path``.
         """
         fctx = self._get_filectx(path)
         if 'x' in fctx.flags():
-            return 0100755
+            return 0o100755
         else:
-            return 0100644
+            return 0o100644
     def get_file_content(self, path):
         """
         Returns content of the file at given ``path``.
         """
         fctx = self._get_filectx(path)
         return fctx.data()
     def get_file_size(self, path):
         """
         Returns size of the file at given ``path``.
         """

kallithea/lib/vcs/nodes.py

➞

Show inline comments

@@ @@ -246,25 +246,25 @@ class FileNode(Node): @@
         :param path: relative path to the node
         :param content: content may be passed to constructor
         :param changeset: if given, will use it to lazily fetch content
         :param mode: octal representation of ST_MODE (i.e. 0100644)
         """
         if content and changeset:
             raise NodeError("Cannot use both content and changeset")
         super(FileNode, self).__init__(path, kind=NodeKind.FILE)
         self.changeset = changeset
         self._content = content
-        self._mode = mode or 0100644
+        self._mode = mode or 0o100644
     @LazyProperty
     def mode(self):
         """
         Returns lazily mode of the FileNode. If ``changeset`` is not set, would
         use value given at initialization or 0100644 (default).
         """
         if self.changeset:
             mode = self.changeset.get_file_mode(self.path)
         else:
             mode = self._mode
         return mode

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -741,25 +741,25 @@ class ScmModel(object): @@
                         except Exception:
                             log.error(traceback.format_exc())
             else:
                 # there is no hook in this dir, so we want to create one
                 has_hook = True
             if has_hook or force_create:
                 log.debug('writing %s hook file !', h_type)
                 try:
                     with open(_hook_file, 'wb') as f:
                         tmpl = tmpl.replace('_TMPL_', kallithea.__version__)
                         f.write(tmpl)
-                    os.chmod(_hook_file, 0755)
+                    os.chmod(_hook_file, 0o755)
                 except IOError as e:
                     log.error('error writing %s: %s', _hook_file, e)
             else:
                 log.debug('skipping writing hook file')
 def AvailableRepoGroupChoices(top_perms, repo_group_perm_level, extras=()):
     """Return group_id,string tuples with choices for all the repo groups where
     the user has the necessary permissions.
     Top level is -1.
     """

kallithea/tests/vcs/test_git.py

➞

Show inline comments

@@ @@ -648,25 +648,25 @@ class TestGitSpecificWithRepo(_BackendTe @@
     backend_alias = 'git'
     @classmethod
     def _get_commits(cls):
         return [
+            {
                 'message': 'Initial',
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': datetime.datetime(2010, 1, 1, 20),
                 'added': [
                     FileNode('foobar/static/js/admin/base.js', content='base'),
                     FileNode('foobar/static/admin', content='admin',
-                        mode=0120000), # this is a link
+                        mode=0o120000), # this is a link
                     FileNode('foo', content='foo'),
                 ],
             },
+            {
                 'message': 'Second',
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': datetime.datetime(2010, 1, 1, 22),
                 'added': [
                     FileNode('foo2', content='foo2'),
                 ],
             },
+        ]

kallithea/tests/vcs/test_nodes.py

➞

Show inline comments

@@ @@ -135,31 +135,31 @@ class TestNodeBasic(object): @@
         mode = node.mode  # default should be 0100644
         assert mode & stat.S_IRUSR
         assert mode & stat.S_IWUSR
         assert mode & stat.S_IRGRP
         assert mode & stat.S_IROTH
         assert not mode & stat.S_IWGRP
         assert not mode & stat.S_IWOTH
         assert not mode & stat.S_IXUSR
         assert not mode & stat.S_IXGRP
         assert not mode & stat.S_IXOTH
     def test_file_node_is_executable(self):
-        node = FileNode('foobar', 'empty... almost', mode=0100755)
+        node = FileNode('foobar', 'empty... almost', mode=0o100755)
         assert node.is_executable
-        node = FileNode('foobar', 'empty... almost', mode=0100500)
+        node = FileNode('foobar', 'empty... almost', mode=0o100500)
         assert node.is_executable
-        node = FileNode('foobar', 'empty... almost', mode=0100644)
+        node = FileNode('foobar', 'empty... almost', mode=0o100644)
         assert not node.is_executable
     def test_mimetype(self):
         py_node = FileNode('test.py')
         tar_node = FileNode('test.tar.gz')
         my_node2 = FileNode('myfile2')
         my_node2._content = 'foobar'
         my_node3 = FileNode('myfile3')
         my_node3._content = '\0foobar'

0 comments (0 inline, 0 general)