Merge branch 'release/0.8.4'

MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

spotify/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
 try:
  from spotify.client import Spotify

spotify/components/base.py

@@ -1,7 +1,7 @@
 from requests_futures.sessions import FuturesSession
 import logging
 
-USER_AGENT = 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1941.0 Safari/537.36'
+USER_AGENT = 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2224.3 Safari/537.36'
 
 log = logging.getLogger(__name__)
 

spotify/components/connection.py

@@ -1,9 +1,10 @@
-from spotify.components.base import Component
+from spotify.components.base import Component, USER_AGENT
 from spotify.core.helpers import repr_trim
 from spotify.core.request import Request
 
 from pyemitter import Emitter
 from threading import Lock, Timer
+from ws4py import WS_VERSION
 from ws4py.client.threadedclient import WebSocketClient
 import json
 import logging
@@ -208,6 +209,31 @@ def __init__(self, connection, *args, **kwargs):
 
  self.daemon = True
 
+ @property
+ def handshake_headers(self):
+ """
+ List of headers appropriate for the upgrade
+ handshake.
+ """
+ headers = [
+ ('Host', self.host),
+ ('Connection', 'Upgrade'),
+ ('Upgrade', 'websocket'),
+ ('Origin', self.url),
+ ('Sec-WebSocket-Version', str(max(WS_VERSION))),
+ ('User-Agent', USER_AGENT),
+
+ ('Sec-WebSocket-Key', self.key.decode('utf-8')),
+ ]
+
+ if self.protocols:
+ headers.append(('Sec-WebSocket-Protocol', ','.join(self.protocols)))
+
+ if self.extra_headers:
+ headers.extend(self.extra_headers)
+
+ return headers
+
  def opened(self):
  self.emit('open')