From: Scott Worley Date: Sat, 13 Jun 2020 06:28:27 +0000 (-0700) Subject: Re-order definitions X-Git-Tag: 2.0.0~31 X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/faff8642d1b68a819a41186ec720a0f00f43f712?hp=f8f5b12546942d8d801f3cda70c798d4a4e4ae13 Re-order definitions --- diff --git a/pinch.py b/pinch.py index cc653da..a8af6a6 100644 --- a/pinch.py +++ b/pinch.py @@ -38,34 +38,6 @@ xdg = XDG( os.path.expanduser('~/.cache'))) -Digest16 = NewType('Digest16', str) -Digest32 = NewType('Digest32', str) - - -class ChannelTableEntry(types.SimpleNamespace): - absolute_url: str - digest: Digest16 - file: str - size: int - url: str - - -class SearchPath(types.SimpleNamespace): - release_name: str - - -class Channel(SearchPath): - alias_of: str - channel_html: bytes - channel_url: str - forwarded_url: str - git_ref: str - git_repo: str - git_revision: str - old_git_revision: str - table: Dict[str, ChannelTableEntry] - - class VerificationError(Exception): pass @@ -101,6 +73,34 @@ class Verification: self.result(True) +Digest16 = NewType('Digest16', str) +Digest32 = NewType('Digest32', str) + + +class ChannelTableEntry(types.SimpleNamespace): + absolute_url: str + digest: Digest16 + file: str + size: int + url: str + + +class SearchPath(types.SimpleNamespace): + release_name: str + + +class Channel(SearchPath): + alias_of: str + channel_html: bytes + channel_url: str + forwarded_url: str + git_ref: str + git_repo: str + git_revision: str + old_git_revision: str + table: Dict[str, ChannelTableEntry] + + def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]: def throw(error: OSError) -> None: