From: Aaron Hill <aa1ronham@gmail.com>
Date: Tue, 8 Apr 2014 19:51:02 +0000 (-0400)
Subject: Revert "Don't add 'delimited=length' to self.parameters"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=17f151b835a27ea4e995e5ad7ff2bb1ab563b9cf;p=tweepy.git

Revert "Don't add 'delimited=length' to self.parameters"

This reverts commit 4374ec2f0b5030a3d234d8ee3d60e559e2ef3910.
Until I figure out what's going on with 'delimited=length', I'm going to
leave things as-is.
---

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index d7a6b6c..33f1169 100644
--- a/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@ -242,7 +242,7 @@ class Stream(object):
 
     def userstream(self, stall_warnings=False, _with=None, replies=None,
             track=None, locations=None, async=False, encoding='utf8'):
-        self.parameters = {}
+        self.parameters = {'delimited': 'length'}
         if self.running:
             raise TweepError('Stream object already connected!')
         self.url = '/%s/user.json?delimited=length' % STREAM_VERSION
@@ -263,7 +263,7 @@ class Stream(object):
         self._start(async)
 
     def firehose(self, count=None, async=False):
-        self.parameters = {}
+        self.parameters = {'delimited': 'length'}
         if self.running:
             raise TweepError('Stream object already connected!')
         self.url = '/%s/statuses/firehose.json?delimited=length' % STREAM_VERSION
@@ -272,14 +272,14 @@ class Stream(object):
         self._start(async)
 
     def retweet(self, async=False):
-        self.parameters = {}
+        self.parameters = {'delimited': 'length'}
         if self.running:
             raise TweepError('Stream object already connected!')
         self.url = '/%s/statuses/retweet.json?delimited=length' % STREAM_VERSION
         self._start(async)
 
     def sample(self, async=False):
-        self.parameters = {}
+        self.parameters = {'delimited': 'length'}
         if self.running:
             raise TweepError('Stream object already connected!')
         self.url = '/%s/statuses/sample.json?delimited=length' % STREAM_VERSION
@@ -306,6 +306,7 @@ class Stream(object):
         if languages:
             self.parameters['language'] = ','.join(map(str, languages))
         self.body = urlencode_noplus(self.parameters)
+        self.parameters['delimited'] = 'length'
         self._start(async)
 
     def disconnect(self):