# This is a combination of 3 commits.

# The first commit's message is:
Set daemon flag on async threads.

# The 2nd commit message will be skipped:

#	Allow optionally setting thread's daemon but default to false.

# The 3rd commit message will be skipped:

#	Revert "Allow optionally setting thread's daemon but default to false."
#
#	This reverts commit fd27bc29cf22c8050c9ef62d4bb69b2eb065de90.

diff --git a/tweepy/streaming.py b/tweepy/streaming.py
index 309124ed6966aae93989b4ea3010e9260f3f344d..68d3f866c8c9515e09a833cb1f410a866a24f039 100644 (file)
--- a/tweepy/streaming.py
+++ b/tweepy/streaming.py
@@ -364,6 +364,7 @@ class Stream(object):
         self.running = True
         if is_async:
             self._thread = Thread(target=self._run)
+            self._thread.daemon = True
             self._thread.start()
         else:
             self._run()