Merge pull request #413 from bear/master

merge latest master changes into develop

Author: bear

Makefile

@@ -11,12 +11,14 @@ help:
 env:
 	pip install -Ur requirements.txt
 
-dev: env
+pyenv:
 	pyenv install -s 2.7.11
 	pyenv install -s 3.5.1
 	pyenv install -s pypy-5.3.1
-	pyenv install -s pypy3-2.4.0
-	pyenv local 2.7.11 3.5.1 pypy-5.3.1 pypy3-2.4.0
+	# pyenv install -s pypy3-2.4.0
+	pyenv local 2.7.11 3.5.1 pypy-5.3.1 # pypy3-2.4.0
+
+dev: env pyenv
 	pip install -Ur requirements.testing.txt
 
 info:
@@ -48,13 +50,7 @@ coverage: clean
 	coverage html
 	coverage report
 
-ci:
-	pyenv install -s 2.7.11
-	pyenv install -s 3.5.1
-	pyenv install -s pypy-5.3.1
-	pyenv install -s pypy3-2.4.0
-	pyenv local 2.7.11 3.5.1 pypy-5.3.1 pypy3-2.4.0
-	pip install -Ur requirements.testing.txt
+ci: pyenv
 	tox
 	CODECOV_TOKEN=`cat .codecov-token` codecov
 

twitter/api.py

@@ -1490,7 +1490,7 @@ def _TweetTextWrap(self,
         line_length = 0
         words = re.split(r'\s', status)
 
-        if len(words) == 1 and not is_url(words):
+        if len(words) == 1 and not is_url(words[0]):
             if len(words[0]) > 140:
                 raise TwitterError({"message": "Unable to split status into tweetable parts. Word was: {0}/{1}".format(len(words[0]), char_lim)})
             else: