Removed duplicated code

CL-541
This commit is contained in:
Jaime van Kessel 2017-11-27 17:14:30 +01:00
parent 83b13546fb
commit c1c59925de

View file

@ -113,15 +113,10 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
return True return True
def _createEmptyFormRequest(self, target): def _createEmptyRequest(self, target, content_type: Optional[str] = "application/json"):
url = QUrl("http://" + self._address + self._api_prefix + target)
request = QNetworkRequest(url)
request.setHeader(QNetworkRequest.UserAgentHeader, self._user_agent)
return request
def _createEmptyRequest(self, target):
url = QUrl("http://" + self._address + self._api_prefix + target) url = QUrl("http://" + self._address + self._api_prefix + target)
request = QNetworkRequest(url) request = QNetworkRequest(url)
if content_type is not None:
request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json") request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
request.setHeader(QNetworkRequest.UserAgentHeader, self._user_agent) request.setHeader(QNetworkRequest.UserAgentHeader, self._user_agent)
return request return request
@ -168,7 +163,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def postForm(self, target: str, header_data: str, body_data: bytes, onFinished: Optional[Callable[[Any, QNetworkReply], None]], onProgress: Callable = None): def postForm(self, target: str, header_data: str, body_data: bytes, onFinished: Optional[Callable[[Any, QNetworkReply], None]], onProgress: Callable = None):
if self._manager is None: if self._manager is None:
self._createNetworkManager() self._createNetworkManager()
request = self._createEmptyFormRequest(target) request = self._createEmptyRequest(target, content_type=None)
multi_post_part = QHttpMultiPart(QHttpMultiPart.FormDataType) multi_post_part = QHttpMultiPart(QHttpMultiPart.FormDataType)
post_part = QHttpPart() post_part = QHttpPart()