Use reset_base_headers to initialize headers

Author: glensc

plexapi/client.py

@@ -3,7 +3,7 @@
 from xml.etree import ElementTree
 
 import requests
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
+from plexapi import CONFIG, TIMEOUT, log, logfilter, reset_base_headers, utils
 from plexapi.base import PlexObject
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized, Unsupported
 from plexapi.playqueue import PlayQueue
@@ -74,6 +74,8 @@ def __init__(self, server=None, data=None, initpath=None, baseurl=None,
         self._last_call = 0
         self._timeline_cache = []
         self._timeline_cache_timestamp = 0
+        self._base_headers = reset_base_headers()
+
         if not any([data is not None, initpath, baseurl, token]):
             self._baseurl = CONFIG.get('auth.client_baseurl', 'http://localhost:32433')
             self._token = logfilter.add_secret(CONFIG.get('auth.client_token'))
@@ -149,7 +151,7 @@ def _loadData(self, data):
 
     def _headers(self, **kwargs):
         """ Returns a dict of all default headers for Client requests. """
-        headers = BASE_HEADERS
+        headers = self._base_headers.copy()
         if self._token:
             headers['X-Plex-Token'] = self._token
         headers.update(kwargs)

plexapi/myplex.py

@@ -8,7 +8,8 @@
 
 import requests
 from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_CONTAINER_SIZE,
-                     X_PLEX_ENABLE_FAST_CONNECT, X_PLEX_IDENTIFIER, log, logfilter, utils)
+                     X_PLEX_ENABLE_FAST_CONNECT, X_PLEX_IDENTIFIER, log,
+                     logfilter, reset_base_headers, utils)
 from plexapi.base import PlexObject
 from plexapi.client import PlexClient
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
@@ -94,6 +95,7 @@ def __init__(self, username=None, password=None, token=None, session=None, timeo
         self._session = session or requests.Session()
         self._sonos_cache = []
         self._sonos_cache_timestamp = 0
+        self._base_headers = reset_base_headers()
         data, initpath = self._signin(username, password, code, timeout)
         super(MyPlexAccount, self).__init__(self, data, initpath)
 
@@ -168,7 +170,7 @@ def devices(self):
 
     def _headers(self, **kwargs):
         """ Returns dict containing base headers for all requests to the server. """
-        headers = BASE_HEADERS.copy()
+        headers = self._base_headers.copy()
         if self._token:
             headers['X-Plex-Token'] = self._token
         headers.update(kwargs)
@@ -1539,6 +1541,7 @@ def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False)
         super(MyPlexPinLogin, self).__init__()
         self._session = session or requests.Session()
         self._requestTimeout = requestTimeout or TIMEOUT
+        self._base_headers = reset_base_headers()
         self.headers = headers
 
         self._oauth = oauth
@@ -1706,7 +1709,7 @@ def _pollLogin(self):
 
     def _headers(self, **kwargs):
         """ Returns dict containing base headers for all requests for pin login. """
-        headers = BASE_HEADERS.copy()
+        headers = self._base_headers.copy()
         if self.headers:
             headers.update(self.headers)
         headers.update(kwargs)

plexapi/server.py

@@ -5,7 +5,7 @@
 import requests
 import os
 from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_CONTAINER_SIZE, log,
-                     logfilter)
+                     logfilter, reset_base_headers)
 from plexapi import utils
 from plexapi.alert import AlertListener
 from plexapi.base import PlexObject
@@ -112,6 +112,7 @@ def __init__(self, baseurl=None, token=None, session=None, timeout=None):
         self._myPlexAccount = None   # cached myPlexAccount
         self._systemAccounts = None   # cached list of SystemAccount
         self._systemDevices = None   # cached list of SystemDevice
+        self._base_headers = reset_base_headers()
         data = self.query(self.key, timeout=self._timeout)
         super(PlexServer, self).__init__(self, data, self.key)
 
@@ -162,7 +163,7 @@ def _loadData(self, data):
 
     def _headers(self, **kwargs):
         """ Returns dict containing base headers for all requests to the server. """
-        headers = BASE_HEADERS.copy()
+        headers = self._base_headers.copy()
         if self._token:
             headers['X-Plex-Token'] = self._token
         headers.update(kwargs)