nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various oddities found in Live

Browse Source
This commit is contained in:
Andrew Williams
2012-07-06 19:20:02 +01:00
parent b03d09fe4f
commit e096c0fafe
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/reddit/api.py
View File

@@ -82,7 +82,8 @@ class RedditAPI:
url = '%s?%s' % (url, data) url = '%s?%s' % (url, data)
data = None data = None
resp = self._opener.open(urllib2.Request(url, data)) headers = {'User-Agent': 'evedreddit-auth/1.0'}
resp = self._opener.open(urllib2.Request(url, data, headers))
resptxt = resp.read() resptxt = resp.read()
if resp.info()['Content-Type'] == 'text/plain': if resp.info()['Content-Type'] == 'text/plain':
logging.info('returning plaintext') logging.info('returning plaintext')
@@ -157,17 +158,17 @@ class Inbox(RedditAPI):
if not self.loggedin: if not self.loggedin:
raise NotLoggedIn raise NotLoggedIn
if not hasattr(self, '__inbox_cache') or not len(self.__inbox_cache): if not hasattr(self, '_inbox_cache') or not len(self._inbox_cache):
inbox = self._request(self._url(self.REDDIT_API_INBOX), {'mark': 'false'}, method='GET') inbox = self._request(self._url(self.REDDIT_API_INBOX), {'mark': 'false'}, method='GET')
if inbox and 'data' in inbox: if inbox and 'data' in inbox:
self.__inbox_cache = [] self._inbox_cache = []
for msg in inbox['data']['children']: for msg in inbox['data']['children']:
self.__inbox_cache.append(Message(msg['data'])) self._inbox_cache.append(Message(msg['data']))
else: else:
self.__inbox_cache = [] self._inbox_cache = []
return self.__inbox_cache return self._inbox_cache
def __len__(self): def __len__(self):
return len(self._inbox_data) return len(self._inbox_data)