Urlparse fix for py2

JosXa · JosXa · commit 51b848f4d7db · 2017-10-02T15:48:30.000+02:00
diff --git a/examples/echobot2.py b/examples/echobot2.py
@@ -15,6 +15,9 @@
 Press Ctrl-C on the command line or send a signal to the process to stop the
 bot.
 """
+from pprint import pprint
+
+from telegram.utils import helpers
 
 from telegram.ext import Updater, CommandHandler, MessageHandler, Filters
 import logging
@@ -37,7 +40,7 @@ def help(bot, update):
 
 
 def echo(bot, update):
-    update.message.reply_text(update.message.text)
+    update.message.reply_text(helpers.extract_urls(update.message))
 
 
 def error(bot, update, error):
@@ -46,7 +49,7 @@ def error(bot, update, error):
 
 def main():
     # Create the EventHandler and pass it your bot's token.
-    updater = Updater("TOKEN")
+    updater = Updater("324133401:AAHVjjXotCDXC_kIIkfM0O6bm9-l7BfJw-I")
 
     # Get the dispatcher to register handlers
     dp = updater.dispatcher
@@ -56,14 +59,22 @@ def main():
     dp.add_handler(CommandHandler("help", help))
 
     # on noncommand i.e message - echo the message on Telegram
-    dp.add_handler(MessageHandler(Filters.text, echo))
+    dp.add_handler(MessageHandler(Filters.photo, echo))
 
     # log all errors
     dp.add_error_handler(error)
 
     # Start the Bot
     updater.start_polling()
 
+    urls = "http://google.com and http://github.com/ and python-telegram-bot.readthedocs.io/en/latest/"
+    result = helpers._extract_urls_from_text(urls)
+    pprint(result)
+    assert len(result) == 3
+    assert result[0] == 'http://google.com'
+    assert result[1] == 'http://github.com/'
+    assert result[2] == 'python-telegram-bot.readthedocs.io/en/latest/'
+
     # Run the bot until you press Ctrl-C or the process receives SIGINT,
     # SIGTERM or SIGABRT. This should be used most of the time, since
     # start_polling() is non-blocking and will stop the bot gracefully.
diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
@@ -21,7 +21,10 @@
 import re
 from collections import OrderedDict
 from datetime import datetime
-from urllib.parse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+     from urlparse import urlparse
 
 try:
     from html import escape as escape_html  # noqa: F401
