equal
deleted
inserted
replaced
1 from models import * |
1 from models import * |
2 import datetime |
2 import datetime |
3 import email.utils |
3 import email.utils |
4 import json |
4 import anyjson |
5 import logging |
5 import logging |
6 import os.path |
6 import os.path |
7 import sys |
7 import sys |
8 import twitter |
8 import twitter |
9 import twitter.oauth |
9 import twitter.oauth |
73 |
73 |
74 if json_dict is None and json_txt is None: |
74 if json_dict is None and json_txt is None: |
75 raise TwitterProcessorException("No json") |
75 raise TwitterProcessorException("No json") |
76 |
76 |
77 if json_dict is None: |
77 if json_dict is None: |
78 self.json_dict = json.loads(json_txt) |
78 self.json_dict = anyjson.deserialize(json_txt) |
79 else: |
79 else: |
80 self.json_dict = json_dict |
80 self.json_dict = json_dict |
81 |
81 |
82 if not json_txt: |
82 if not json_txt: |
83 self.json_txt = json.dumps(json_dict) |
83 self.json_txt = json.serialize(json_dict) |
84 else: |
84 else: |
85 self.json_txt = json_txt |
85 self.json_txt = json_txt |
86 |
86 |
87 if "id" not in self.json_dict: |
87 if "id" not in self.json_dict: |
88 raise TwitterProcessorException("No id in json") |
88 raise TwitterProcessorException("No id in json") |
242 } |
242 } |
243 |
243 |
244 #user |
244 #user |
245 |
245 |
246 user_fields = { |
246 user_fields = { |
247 'id' : self.json_dict['from_user_id'], |
|
248 'id_str' : self.json_dict['from_user_id_str'], |
|
249 'lang' : self.json_dict['iso_language_code'], |
247 'lang' : self.json_dict['iso_language_code'], |
250 'profile_image_url' : self.json_dict["profile_image_url"], |
248 'profile_image_url' : self.json_dict["profile_image_url"], |
251 'screen_name' : self.json_dict["from_user"], |
249 'screen_name' : self.json_dict["from_user"], |
252 } |
250 } |
253 |
251 |