summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2014-12-16 09:36:53 -0800
committerIan Lee <IanLee1521@gmail.com>2014-12-16 09:36:53 -0800
commit4f047a1f7cb49b18eed839c7b1b02d39a6eddb1d (patch)
treef020c4a11db8113c2fac17e6c7a9bf529427ed01
parent904e37673ce2072a463a3e9237ff86fbc7309e29 (diff)
downloadpep8-4f047a1f7cb49b18eed839c7b1b02d39a6eddb1d.tar.gz
Catch import errors thrown by os.path.expanduser(); issue #297
* This can happen particularly with AppEngine when importing pwd
-rwxr-xr-xpep8.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/pep8.py b/pep8.py
index a38b4f4..6f6a4c4 100755
--- a/pep8.py
+++ b/pep8.py
@@ -66,11 +66,15 @@ except ImportError:
DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
DEFAULT_IGNORE = 'E123,E226,E24,E704'
-if sys.platform == 'win32':
- DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')
-else:
- DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or
- os.path.expanduser('~/.config'), 'pep8')
+try:
+ if sys.platform == 'win32':
+ DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')
+ else:
+ DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or
+ os.path.expanduser('~/.config'), 'pep8')
+except ImportError:
+ DEFAULT_CONFIG = None
+
PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8')
TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite')
MAX_LINE_LENGTH = 79