WIP: 3.0.0 #210

Merged
michaelhelmick merged 43 commits from 3.0.0 into master 2013-06-17 10:51:49 -07:00
2 changed files with 1 additions and 5 deletions
Showing only changes of commit 672c8db77e - Show all commits

View file

@ -1,6 +1,5 @@
coverage==3.6.0
requests==1.2.2
requests_oauthlib==0.3.2
sphinxjp.themes.basicstrap==0.2.0
python-coveralls==2.1.0
nose-cov==1.6

View file

@ -25,10 +25,7 @@ except ImportError:
if is_py2:
from urllib import urlencode, quote_plus
try:
from urlparse import parse_qsl
except ImportError:
from cgi import parse_qsl
str = unicode
basestring = basestring