Merge pull request #350 from Aaron1011/sitestream

Added sitestream endpoint

diff --cc tests/test_streaming.py
index f9008bcf1c5874577d5bd3c3590389f2e83b7b12,f796417d32353122adbdac0ba5744af26bf6ab7b..d41ae0e322367874074c2a827674c16fb08e5112
--- 1/tests/test_streaming.py
--- 2/tests/test_streaming.py
+++ b/tests/test_streaming.py
@@@ -54,17 -56,13 +56,23 @@@ class TweepyStreamTests(unittest.TestCa
          self.listener.status_stop_count = 1
          self.stream.userstream()
          self.assertEqual(self.listener.status_count, 1)
+     
+     def test_sitestream(self):
+         self.listener.connect_cb = self.on_connect
+         self.listener.status_stop_count = 1
+         self.sitestream(follow=[self.auth.get_username()])
+         self.assertEqual(self.listener.status_count, 1)
  
 +    def test_userstream_with_params(self):
 +        # Generate random tweet which should show up in the stream.
 +        def on_connect():
 +            API(self.auth).update_status(mock_tweet())
 +
 +        self.listener.connect_cb = on_connect
 +        self.listener.status_stop_count = 1
 +        self.stream.userstream(_with='user', replies='all', stall_warnings=True)
 +        self.assertEqual(self.listener.status_count, 1)
 +
      def test_sample(self):
          self.listener.status_stop_count = 10
          self.stream.sample()

diff --cc tweepy/streaming.py
index 187b14dc054a1c107288f84e3db7f7651194615b,6f9a5067d56ff9efa2062576714ec4e48fb2137f..831474d915f4a158192a5b3875c73759769c55be
--- 1/tweepy/streaming.py
--- 2/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@@ -284,35 -268,50 +284,51 @@@ class Stream(object)
          if self.running:
              raise TweepError('Stream object already connected!')
          self.url = '/%s/statuses/sample.json?delimited=length' % STREAM_VERSION
 -        if count:
 -            self.url += '&count=%s' % count
          self._start(async)
  
 -    def filter(self, follow=None, track=None, async=False, locations=None, 
 -        count = None, stall_warnings=False, languages=None):
 -        self.parameters = {}
 -        self.headers['Content-type'] = "application/x-www-form-urlencoded"
 +    def filter(self, follow=None, track=None, async=False, locations=None,
 +               stall_warnings=False, languages=None, encoding='utf8'):
 +        self.session.params = {}
 +        self.session.headers['Content-type'] = "application/x-www-form-urlencoded"
          if self.running:
              raise TweepError('Stream object already connected!')
 -        self.url = '/%s/statuses/filter.json?delimited=length' % STREAM_VERSION
 +        self.url = '/%s/statuses/filter.json' % STREAM_VERSION
          if follow:
 -            self.parameters['follow'] = ','.join(map(str, follow))
 +            encoded_follow = [s.encode(encoding) for s in follow]
 +            self.session.params['follow'] = ','.join(encoded_follow)
          if track:
 -            self.parameters['track'] = ','.join(map(str, track))
 +            encoded_track = [s.encode(encoding) for s in track]
 +            self.session.params['track'] = ','.join(encoded_track)
          if locations and len(locations) > 0:
 -            assert len(locations) % 4 == 0
 -            self.parameters['locations'] = ','.join(['%.2f' % l for l in locations])
 -        if count:
 -            self.parameters['count'] = count
 +            if len(locations) % 4 != 0:
 +                raise TweepError("Wrong number of locations points, "
 +                                 "it has to be a multiple of 4")
 +            self.session.params['locations'] = ','.join(['%.4f' % l for l in locations])
          if stall_warnings:
 -            self.parameters['stall_warnings'] = stall_warnings
 +            self.session.params['stall_warnings'] = stall_warnings
          if languages:
 -            self.parameters['language'] = ','.join(map(str, languages))
 -        self.body = urlencode_noplus(self.parameters)
 -        self.parameters['delimited'] = 'length'
 +            self.session.params['language'] = ','.join(map(str, languages))
 +        self.body = urlencode_noplus(self.session.params)
 +        self.session.params['delimited'] = 'length'
 +        self.host = 'stream.twitter.com'
          self._start(async)
  
+     def sitestream(self, follow, stall_warnings=False, with_='user', replies=False, async=False):
+         self.parameters = {}
+         if self.running:
+             raise TweepError('Stream object already connected!')
+         self.url = '/%s/site.json' % STREAM_VERSION
+         self.parameters['follow'] = ','.join(map(str, follow))
+         self.parameters['delimited'] = 'length'
+         if stall_warnings:
+             self.parameters['stall_warnings'] = stall_warnings
+         if with_:
+             self.parameters['with'] = with_
+         if replies:
+             self.parameters['replies'] = replies
+         self.body = urlencode_noplus(self.parameters)
+         self._start(async)
+ 
      def disconnect(self):
          if self.running is False:
              return