/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transport/http/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2019-08-11 13:33:45 UTC
  • mfrom: (7379 work)
  • mto: This revision was merged to the branch mainline in revision 7389.
  • Revision ID: jelmer@jelmer.uk-20190811133345-dp9j3c569vxj4l9y
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/http/__init__.py
24
24
DEBUG = 0
25
25
 
26
26
import base64
 
27
import cgi
27
28
import errno
28
29
import os
29
30
import re
1821
1822
    """
1822
1823
 
1823
1824
    accepted_errors = [200,  # Ok
 
1825
                       201,
1824
1826
                       206,  # Partial content
1825
1827
                       400,
1826
1828
                       403,
2018
2020
 
2019
2021
            @property
2020
2022
            def text(self):
2021
 
                return self.data.decode()
 
2023
                charset = cgi.parse_header(
 
2024
                    self._actual.headers['Content-Type'])[1].get('charset')
 
2025
                return self.data.decode(charset)
2022
2026
 
2023
2027
            def read(self, amt=None):
2024
2028
                return self._actual.read(amt)
2025
2029
 
 
2030
            def readlines(self):
 
2031
                return self._actual.readlines()
 
2032
 
 
2033
            def readlines(self):
 
2034
                return self._actual.readlines()
 
2035
 
2026
2036
            def readline(self, size=-1):
2027
2037
                return self._actual.readline(size)
2028
2038