remove path from external

IPython/utils/pickleshare.py

@@ -34,7 +34,6 b' License: MIT open source license.'
 """
 from __future__ import print_function
 
-from IPython.external.path import path as Path
 import stat, time
 import collections
 try:
@@ -43,6 +42,8 b' except ImportError:'
     import pickle
 import glob
 
+from path import path as Path
+
 def gethashfile(key):
     return ("%02x" % abs(hash(key) % 256))[-2:]
 

IPython/utils/text.py

@@ -8,42 +8,21 b' Inheritance diagram:'
    :parts: 3
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
 import os
 import re
 import sys
 import textwrap
 from string import Formatter
 
-from IPython.external.path import path
 from IPython.testing.skipdoctest import skip_doctest_py3, skip_doctest
 from IPython.utils import py3compat
 
-#-----------------------------------------------------------------------------
-# Declarations
-#-----------------------------------------------------------------------------
-
 # datetime.strftime date format for ipython
 if sys.platform == 'win32':
     date_format = "%B %d, %Y"
 else:
     date_format = "%B %-d, %Y"
 
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
 class LSString(str):
     """String derivative with a special access attributes.
 
@@ -52,7 +31,7 b' class LSString(str):'
         .l (or .list) : value as list (split on newlines).
         .n (or .nlstr): original value (the string itself).
         .s (or .spstr): value as whitespace-separated string.
-        .p (or .paths): list of path objects
+        .p (or .paths): list of path objects (requires path.py package)
 
     Any values which require transformations are computed only once and
     cached.
@@ -84,6 +63,7 b' class LSString(str):'
     n = nlstr = property(get_nlstr)
 
     def get_paths(self):
+        from path import path
         try:
             return self.__paths
         except AttributeError:
@@ -113,7 +93,7 b' class SList(list):'
     * .l (or .list) : value as list (the list itself).
     * .n (or .nlstr): value as a string, joined on newlines.
     * .s (or .spstr): value as a string, joined on spaces.
-    * .p (or .paths): list of path objects
+    * .p (or .paths): list of path objects (requires path.py package)
 
     Any values which require transformations are computed only once and
     cached."""
@@ -142,6 +122,7 b' class SList(list):'
     n = nlstr = property(get_nlstr)
 
     def get_paths(self):
+        from path import path
         try:
             return self.__paths
         except AttributeError:

setup.py

@@ -268,7 +268,9 b' if sys.version_info < (3, 3):'
 extras_require['notebook'].extend(extras_require['nbformat'])
 extras_require['nbconvert'].extend(extras_require['nbformat'])
 
-install_requires = []
+install_requires = [
+    'path.py', # required by pickleshare, remove when pickleshare is added here
+]
 
 # add readline
 if sys.platform == 'darwin':