Merge pull request #1709 from samuelhug/test-branch

Fix for AppEngine
This commit is contained in:
2013-10-28 10:40:52 -07:00
+2 -1
View File
@@ -17,7 +17,6 @@ import os
import platform
import re
import sys
from netrc import netrc, NetrcParseError
from . import __version__
from . import certs
@@ -67,6 +66,8 @@ def get_netrc_auth(url):
"""Returns the Requests tuple auth for a given url from netrc."""
try:
from netrc import netrc, NetrcParseError
locations = (os.path.expanduser('~/{0}'.format(f)) for f in NETRC_FILES)
netrc_path = None