NPO-Accounting/conservancy_beancount Changeset - a61b74308faf

Changeset - a61b74308faf

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith - 4 years ago 2020-03-25 04:13:18
brettcsmith@brettcsmith.org

rtutil: Make RT.parse a classmethod.

Because it works, and I can imagine it being useful to have this
method more handy to other code.

1 file changed with 3 insertions and 2 deletions:

conservancy_beancount/rtutil.py

0 comments (0 inline, 0 general)

conservancy_beancount/rtutil.py

➞

Show inline comments

@@ ... / @@ -55,67 +55,68 @@ class RT: @@
     ) -> str:
         if fragment is None:
             fragment = self.url_base.fragment
         else:
             fragment = urlparse.quote(fragment)
         if query:
             query_s = urlparse.urlencode(query)
         else:
             query_s = self.url_base.query
         urlparts = self.url_base._replace(
             path=self.url_base.path + urlparse.quote(path_tail),
             query=query_s,
             fragment=fragment,
+        )
         return urlparse.urlunparse(urlparts)
     def _ticket_url(self, ticket_id: RTId, txn_id: Optional[RTId]=None) -> str:
         if txn_id is None:
             fragment = None
         else:
             fragment = 'txn-{}'.format(txn_id)
         return self._extend_url('Ticket/Display.html', fragment, id=str(ticket_id))
     @functools.lru_cache()
     def attachment_url(self, ticket_id: RTId, attachment_id: RTId) -> Optional[str]:
         attachment = self.rt.get_attachment(ticket_id, attachment_id)
         if attachment is None:
             return None
         mimetype = attachment.get('ContentType', '')
         if mimetype.startswith('text/'):
             return self._ticket_url(ticket_id, attachment['Transaction'])
         else:
             filename = attachment.get('Filename', '')
             if not filename:
                 filename = 'RT{} attachment {}{}'.format(
                     ticket_id,
                     attachment_id,
                     mimetypes.guess_extension(mimetype) or '.bin',
+                )
             path_tail = 'Ticket/Attachment/{0[Transaction]}/{0[id]}/{1}'.format(
                 attachment,
                 filename,
+            )
             return self._extend_url(path_tail)
     def exists(self, ticket_id: RTId, attachment_id: Optional[RTId]=None) -> bool:
         return self.url(ticket_id, attachment_id) is not None
     def parse(self, s: str) -> Optional[Tuple[str, Optional[str]]]:
         for regexp in self.PARSE_REGEXPS:
     @classmethod
     def parse(cls, s: str) -> Optional[Tuple[str, Optional[str]]]:
         for regexp in cls.PARSE_REGEXPS:
             match = regexp.match(s)
             if match is not None:
                 ticket_id, attachment_id = match.groups()
                 return (ticket_id, attachment_id)
         return None
     @functools.lru_cache()
     def ticket_url(self, ticket_id: RTId) -> Optional[str]:
         if self.rt.get_ticket(ticket_id) is None:
             return None
         return self._ticket_url(ticket_id)
     def url(self, ticket_id: RTId, attachment_id: Optional[RTId]=None) -> Optional[str]:
         if attachment_id is None:
             return self.ticket_url(ticket_id)
         else:
             return self.attachment_url(ticket_id, attachment_id)

0 comments (0 inline, 0 general)