From e03af767ca962e93b5e20daad8a88f7c7113b741 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Sun, 26 Feb 2017 16:12:39 +0100
Subject: [PATCH] Remove `\r` for Plex Companion replies

---
 resources/lib/plexbmchelper/functions.py   | 2 +-
 resources/lib/plexbmchelper/listener.py    | 4 ++--
 resources/lib/plexbmchelper/subscribers.py | 4 ++--
 resources/lib/websocket.py                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/lib/plexbmchelper/functions.py b/resources/lib/plexbmchelper/functions.py
index 5885253d..cdda52fe 100644
--- a/resources/lib/plexbmchelper/functions.py
+++ b/resources/lib/plexbmchelper/functions.py
@@ -57,7 +57,7 @@ def plex_type(xbmc_type):
 
 
 def getXMLHeader():
-    return '<?xml version="1.0" encoding="utf-8" ?>\r\n'
+    return '<?xml version="1.0" encoding="utf-8" ?>\n'
 
 
 def getOKMsg():
diff --git a/resources/lib/plexbmchelper/listener.py b/resources/lib/plexbmchelper/listener.py
index a3728b52..316226d7 100644
--- a/resources/lib/plexbmchelper/listener.py
+++ b/resources/lib/plexbmchelper/listener.py
@@ -101,10 +101,10 @@ class MyHandler(BaseHTTPRequestHandler):
                 params.get('commandID', False))
             if request_path == "version":
                 self.response(
-                    "PlexKodiConnect Plex Companion: Running\r\nVersion: %s"
+                    "PlexKodiConnect Plex Companion: Running\nVersion: %s"
                     % settings['version'])
             elif request_path == "verify":
-                self.response("XBMC JSON connection test:\r\n" +
+                self.response("XBMC JSON connection test:\n" +
                               js.jsonrpc("ping"))
             elif "resources" == request_path:
                 resp = ('%s'
diff --git a/resources/lib/plexbmchelper/subscribers.py b/resources/lib/plexbmchelper/subscribers.py
index 41cb52da..86cde736 100644
--- a/resources/lib/plexbmchelper/subscribers.py
+++ b/resources/lib/plexbmchelper/subscribers.py
@@ -71,7 +71,7 @@ class SubscriptionManager:
         msg += self.getTimelineXML(self.js.getAudioPlayerId(players), plex_audio())
         msg += self.getTimelineXML(self.js.getPhotoPlayerId(players), plex_photo())
         msg += self.getTimelineXML(self.js.getVideoPlayerId(players), plex_video())
-        msg += "\r\n</MediaContainer>"
+        msg += "\n</MediaContainer>"
         return msg
 
     def getTimelineXML(self, playerid, ptype):
@@ -84,7 +84,7 @@ class SubscriptionManager:
         else:
             state = "stopped"
             time = 0
-        ret = "\r\n"+'  <Timeline state="%s" time="%s" type="%s"' % (state, time, ptype)
+        ret = "\n"+'  <Timeline state="%s" time="%s" type="%s"' % (state, time, ptype)
         if playerid is None:
             ret += ' seekRange="0-0"'
             ret += ' />'
diff --git a/resources/lib/websocket.py b/resources/lib/websocket.py
index 6d488e57..03791381 100644
--- a/resources/lib/websocket.py
+++ b/resources/lib/websocket.py
@@ -485,7 +485,7 @@ class WebSocket(object):
         headers.append("")
         headers.append("")
 
-        header_str = "\r\n".join(headers)
+        header_str = "\n".join(headers)
         self._send(header_str)
         if traceEnabled:
             log.debug("--- request header ---")
@@ -530,7 +530,7 @@ class WebSocket(object):
 
         while True:
             line = self._recv_line()
-            if line == "\r\n":
+            if line == "\n":
                 break
             line = line.strip()
             if traceEnabled: