From 500b543aa06245cc533a4d1a21d194c15954a103 2014-10-30 21:43:29
From: Min RK <benjaminrk@gmail.com>
Date: 2014-10-30 21:43:29
Subject: [PATCH] Merge pull request #6819 from minrk/windows-typo

fix Windows typo
---

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 613cbfb..87cd3eb 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -30,7 +30,7 @@ from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict, Set, Instan
 if os.name == 'nt':
     programdata = os.environ.get('PROGRAMDATA', None)
     if programdata:
-        SYSTEM_CONFIG_DIRS = [pjoin(programdata, 'ipython')]
+        SYSTEM_CONFIG_DIRS = [os.path.join(programdata, 'ipython')]
     else:  # PROGRAMDATA is not defined by default on XP.
         SYSTEM_CONFIG_DIRS = []
 else: