Mercurial > p > roundup > code
comparison roundup/rest.py @ 5669:1e8f17090a33
Try to fix mysql crash on close by rolling back mysqlclient.
The version was incremented from 1.3.13 to 1.3.14.
Can't move forward to 1.4 series since 1.4 series drops support for
python 3.4.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 24 Mar 2019 12:51:24 -0400 |
| parents | a4bb88a1a643 |
| children | 6dc4dba1c225 |
comparison
equal
deleted
inserted
replaced
| 5668:a4bb88a1a643 | 5669:1e8f17090a33 |
|---|---|
| 1448 else: | 1448 else: |
| 1449 indent = None | 1449 indent = None |
| 1450 output = RoundupJSONEncoder(indent=indent).encode(output) | 1450 output = RoundupJSONEncoder(indent=indent).encode(output) |
| 1451 elif data_type.lower() == "xml" and dicttoxml: | 1451 elif data_type.lower() == "xml" and dicttoxml: |
| 1452 self.client.setHeader("Content-Type", "application/xml") | 1452 self.client.setHeader("Content-Type", "application/xml") |
| 1453 output = dicttoxml(output, root=False) | 1453 output = b2s(dicttoxml(output, root=False)) |
| 1454 else: | 1454 else: |
| 1455 self.client.response_code = 406 | 1455 self.client.response_code = 406 |
| 1456 output = "Content type is not accepted by client" | 1456 output = "Content type is not accepted by client" |
| 1457 | 1457 |
| 1458 # Make output json end in a newline to | 1458 # Make output json end in a newline to |