From: Aaron Hill <aa1ronham@gmail.com>
Date: Fri, 9 May 2014 23:36:09 +0000 (-0400)
Subject: Use self.session.params instead of self.parameters in stream.userstream()
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c47445022344a5e3f56041128903822dfe4a253;p=tweepy.git

Use self.session.params instead of self.parameters in stream.userstream()
---

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index 54cd7e0..fc3e7c5 100644
--- a/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@ -240,28 +240,25 @@ class Stream(object):
 
     def userstream(self, stall_warnings=False, _with=None, replies=None,
             track=None, locations=None, async=False, encoding='utf8'):
-        self.parameters = {'delimited': 'length'}
+        self.session.params = {'delimited': 'length'}
         if self.running:
             raise TweepError('Stream object already connected!')
         self.url = '/%s/user.json' % STREAM_VERSION
         self.host='userstream.twitter.com'
         if stall_warnings:
-            self.parameters['stall_warnings'] = stall_warnings
+            self.session.params['stall_warnings'] = stall_warnings
         if _with:
-            self.parameters['with'] = _with
+            self.session.params['with'] = _with
         if replies:
-            self.parameters['replies'] = replies
+            self.session.params['replies'] = replies
         if locations and len(locations) > 0:
             if len(locations) % 4 != 0:
                 raise TweepError("Wrong number of locations points, "
                                  "it has to be a multiple of 4")
-            self.parameters['locations'] = ','.join(['%.2f' % l for l in locations])
+            self.session.params['locations'] = ','.join(['%.2f' % l for l in locations])
         if track:
             encoded_track = [s.encode(encoding) for s in track]
-            self.parameters['track'] = ','.join(encoded_track)
-
-        self.body = urlencode_noplus(self.parameters)
-        self.url = self.url + '?' + self.body
+            self.session.params['track'] = ','.join(encoded_track)
 
         self._start(async)