From b5654f478390f401c1375eb234a574a1d269a341 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 26 Jul 2015 10:39:39 +0200
Subject: [PATCH] stream: Move requests session helper to internal

---
 mopidy/internal/http.py | 16 ++++++++++++++++
 mopidy/stream/actor.py  | 17 +++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 mopidy/internal/http.py

diff --git a/mopidy/internal/http.py b/mopidy/internal/http.py
new file mode 100644
index 00000000..6ff59590
--- /dev/null
+++ b/mopidy/internal/http.py
@@ -0,0 +1,16 @@
+from __future__ import absolute_import, unicode_literals
+
+import requests
+
+from mopidy import httpclient
+
+
+def get_requests_session(proxy_config, user_agent):
+    proxy = httpclient.format_proxy(proxy_config)
+    full_user_agent = httpclient.format_user_agent(user_agent)
+
+    session = requests.Session()
+    session.proxies.update({'http': proxy, 'https': proxy})
+    session.headers.update({'user-agent': full_user_agent})
+
+    return session
diff --git a/mopidy/stream/actor.py b/mopidy/stream/actor.py
index a6040f65..069965fb 100644
--- a/mopidy/stream/actor.py
+++ b/mopidy/stream/actor.py
@@ -10,9 +10,9 @@ import pykka
 
 import requests
 
-from mopidy import audio as audio_lib, backend, exceptions, httpclient, stream
+from mopidy import audio as audio_lib, backend, exceptions, stream
 from mopidy.audio import scan, utils
-from mopidy.internal import playlists
+from mopidy.internal import http, playlists
 from mopidy.models import Track
 
 logger = logging.getLogger(__name__)
@@ -95,7 +95,7 @@ class StreamPlaybackProvider(backend.PlaybackProvider):
     def _download(self, uri):
         timeout = self._config['stream']['timeout'] / 1000.0
 
-        session = get_requests_session(
+        session = http.get_requests_session(
             proxy_config=self._config['proxy'],
             user_agent='%s/%s' % (
                 stream.Extension.dist_name, stream.Extension.version))
@@ -126,14 +126,3 @@ class StreamPlaybackProvider(backend.PlaybackProvider):
             return None
 
         return content
-
-
-def get_requests_session(proxy_config, user_agent):
-    proxy = httpclient.format_proxy(proxy_config)
-    full_user_agent = httpclient.format_user_agent(user_agent)
-
-    session = requests.Session()
-    session.proxies.update({'http': proxy, 'https': proxy})
-    session.headers.update({'user-agent': full_user_agent})
-
-    return session