comparison cutils/treesum.py @ 290:3c3f8151f36a

treesum: FIX: Output of empty sizes in Python 3: print a realy empty string instead of "b''"
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 24 Feb 2025 11:50:43 +0100
parents 822cf3a1da22
children cc2deeb5f2e6
comparison
equal deleted inserted replaced
289:79deb10bbe0a 290:3c3f8151f36a
565 util.interpolate_bytes( 565 util.interpolate_bytes(
566 b"%d:%s,%d:%s,", 566 b"%d:%s,%d:%s,",
567 len(self._algorithm[1]), util.b(self._algorithm[1]), 567 len(self._algorithm[1]), util.b(self._algorithm[1]),
568 len(linkdgst.digest()), linkdgst.digest())) 568 len(linkdgst.digest()), linkdgst.digest()))
569 if self._size_only: 569 if self._size_only:
570 self._writer.write_size(b"./@/", b"") 570 self._writer.write_size(b"./@/", "")
571 else: 571 else:
572 sz = b"" if self._print_size else None 572 sz = "" if self._print_size else None
573 self._writer.write_file_digest( 573 self._writer.write_file_digest(
574 self._algorithm[1], 574 self._algorithm[1],
575 b"./@/", 575 b"./@/",
576 dir_dgst.digest(), 576 dir_dgst.digest(),
577 self._use_base64, 577 self._use_base64,
700 # 700 #
701 if self._size_only: 701 if self._size_only:
702 self._writer.write_size( 702 self._writer.write_size(
703 util.interpolate_bytes( 703 util.interpolate_bytes(
704 b"%s/./@%s", opath, special_tag), 704 b"%s/./@%s", opath, special_tag),
705 b"") 705 "")
706 else: 706 else:
707 sz = b"" if self._print_size else None 707 sz = "" if self._print_size else None
708 self._writer.write_file_digest( 708 self._writer.write_file_digest(
709 self._algorithm[1], 709 self._algorithm[1],
710 util.interpolate_bytes( 710 util.interpolate_bytes(
711 b"%s/./@%s", opath, special_tag), 711 b"%s/./@%s", opath, special_tag),
712 linkdgst.digest(), 712 linkdgst.digest(),
741 b"4:mode,%d:%s,", len(modestr), modestr)) 741 b"4:mode,%d:%s,", len(modestr), modestr))
742 if self._size_only: 742 if self._size_only:
743 self._writer.write_size( 743 self._writer.write_size(
744 util.interpolate_bytes( 744 util.interpolate_bytes(
745 b"%s/./%s", opath, special_tag), 745 b"%s/./%s", opath, special_tag),
746 b"") 746 "")
747 else: 747 else:
748 sz = b"" if self._print_size else None 748 sz = "" if self._print_size else None
749 self._writer.write_file_digest( 749 self._writer.write_file_digest(
750 self._algorithm[1], 750 self._algorithm[1],
751 util.interpolate_bytes( 751 util.interpolate_bytes(
752 b"%s/./%s", opath, special_tag), 752 b"%s/./%s", opath, special_tag),
753 b"", 753 b"",
784 len(self._algorithm[1]), util.b(self._algorithm[1]), 784 len(self._algorithm[1]), util.b(self._algorithm[1]),
785 len(linkdgst.digest()), linkdgst.digest())) 785 len(linkdgst.digest()), linkdgst.digest()))
786 if self._size_only: 786 if self._size_only:
787 self._writer.write_size( 787 self._writer.write_size(
788 util.interpolate_bytes(b"%s/./@/", opath), 788 util.interpolate_bytes(b"%s/./@/", opath),
789 b"") 789 "")
790 else: 790 else:
791 sz = b"" if self._print_size else None 791 sz = "" if self._print_size else None
792 self._writer.write_file_digest( 792 self._writer.write_file_digest(
793 self._algorithm[1], 793 self._algorithm[1],
794 util.interpolate_bytes(b"%s/./@/", opath), 794 util.interpolate_bytes(b"%s/./@/", opath),
795 linkdgst.digest(), 795 linkdgst.digest(),
796 self._use_base64) 796 self._use_base64)
866 len(self._algorithm[1]), util.b(self._algorithm[1]), 866 len(self._algorithm[1]), util.b(self._algorithm[1]),
867 len(linkdgst.digest()), linkdgst.digest())) 867 len(linkdgst.digest()), linkdgst.digest()))
868 if self._size_only: 868 if self._size_only:
869 self._writer.write_size( 869 self._writer.write_size(
870 util.interpolate_bytes(b"%s/./@", opath), 870 util.interpolate_bytes(b"%s/./@", opath),
871 b"") 871 "")
872 else: 872 else:
873 sz = b"" if self._print_size else None 873 sz = "" if self._print_size else None
874 self._writer.write_file_digest( 874 self._writer.write_file_digest(
875 self._algorithm[1], 875 self._algorithm[1],
876 util.interpolate_bytes(b"%s/./@", opath), 876 util.interpolate_bytes(b"%s/./@", opath),
877 linkdgst.digest(), 877 linkdgst.digest(),
878 self._use_base64, 878 self._use_base64,