Mercurial > hgrepos > Python > apps > py-cutils
comparison cutils/treesum.py @ 379:6d7659a709f2
FIX: treesum: str.translate() behaves differently in Python3: make it PY3-compatible
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Mon, 12 May 2025 12:12:44 +0200 |
| parents | 32b937a73068 |
| children | ff4424a7a8cf |
comparison
equal
deleted
inserted
replaced
| 378:32b937a73068 | 379:6d7659a709f2 |
|---|---|
| 1842 else: | 1842 else: |
| 1843 mo = self.PATTERN3.search(line) | 1843 mo = self.PATTERN3.search(line) |
| 1844 if mo: | 1844 if mo: |
| 1845 self._update_crc(line) | 1845 self._update_crc(line) |
| 1846 if mo.group(2): | 1846 if mo.group(2): |
| 1847 return ("SIZE", mo.group(1), | 1847 return ("SIZE", |
| 1848 int(util.n(mo.group(3)) | 1848 mo.group(1), |
| 1849 .translate(None, "., '_"), | 1849 util.parse_grouped_decimal_number(mo.group(3))) |
| 1850 10)) | |
| 1851 else: | 1850 else: |
| 1852 return ("SIZE", mo.group(1), None) | 1851 return ("SIZE", mo.group(1), None) |
| 1853 else: | 1852 else: |
| 1854 mo = self.PATTERN4.search(line) | 1853 mo = self.PATTERN4.search(line) |
| 1855 if mo: | 1854 if mo: |
| 1866 digest = base64.b64decode(mo.group(4)) | 1865 digest = base64.b64decode(mo.group(4)) |
| 1867 else: | 1866 else: |
| 1868 digest = None | 1867 digest = None |
| 1869 if mo.group(5): | 1868 if mo.group(5): |
| 1870 if mo.group(6): | 1869 if mo.group(6): |
| 1871 size = int(util.n(mo.group(6)) | 1870 size = util.parse_grouped_decimal_number( |
| 1872 .translate(None, "., '_"), | 1871 mo.group(6)) |
| 1873 10) | |
| 1874 else: | 1872 else: |
| 1875 size = None | 1873 size = None |
| 1876 else: | 1874 else: |
| 1877 size = None | 1875 size = None |
| 1878 return (algo_name, mo.group(2), digest, size) | 1876 return (algo_name, mo.group(2), digest, size) |
