# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1366101729 -7200
# Node ID ed575da0ee15f11a3a4e4c6a101c58edb1edf0e4
# Parent  4c377df665697365c4847d24fabe8f07abae1c43# Parent  e846b15e7a15484c83ebec3c766e1a2b8690132c
Merge with 61e3683f9e2340a8c999a4e1f4aa2e4129d45b5b

diff -r 4c377df66569 -r ed575da0ee15 .project
--- a/.project	Tue Apr 16 10:40:56 2013 +0200
+++ b/.project	Tue Apr 16 10:42:09 2013 +0200
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tweet_live</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.projects.webnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1312812919641</id>
-			<name></name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-.DS_Store</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>tweet_live</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1312812919641</id>
+			<name></name>
+			<type>6</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.DS_Store</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff -r 4c377df66569 -r ed575da0ee15 .pydevproject
--- a/.pydevproject	Tue Apr 16 10:40:56 2013 +0200
+++ b/.pydevproject	Tue Apr 16 10:42:09 2013 +0200
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_tl</pydev_property>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/tweet_live/script/lib</path>
diff -r 4c377df66569 -r ed575da0ee15 script/lib/iri_tweet/iri_tweet/utils.py
--- a/script/lib/iri_tweet/iri_tweet/utils.py	Tue Apr 16 10:40:56 2013 +0200
+++ b/script/lib/iri_tweet/iri_tweet/utils.py	Tue Apr 16 10:42:09 2013 +0200
@@ -415,8 +415,8 @@
             'id': self.json_dict["id"],
             'id_str': self.json_dict["id_str"],
             #'in_reply_to_screen_name': ts["to_user"], 
-            'in_reply_to_user_id': self.json_dict["to_user_id"],
-            'in_reply_to_user_id_str': self.json_dict["to_user_id_str"],
+            'in_reply_to_user_id': self.json_dict.get("in_reply_to_user_id",None),
+            'in_reply_to_user_id_str': self.json_dict.get("in_reply_to_user_id_str", None),
             #'place': ts["place"],
             'source': self.json_dict["source"],
             'text': self.json_dict["text"],