Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Skip doctests where necessary.

  • Loading branch information...
commit bd63ffa0fd50d502b3059597c2eeb40ff5aadbc2 1 parent a2d9aa2
@takluyver authored
Showing with 7 additions and 2 deletions.
  1. +2 −0  IPython/core/history.py
  2. +5 −2 IPython/core/magic.py
View
2  IPython/core/history.py
@@ -24,6 +24,7 @@
# Our own packages
import IPython.utils.io
+from IPython.testing import decorators as testdec
from IPython.utils.pickleshare import PickleShareDB
from IPython.utils.io import ask_yes_no
from IPython.utils.warn import warn
@@ -305,6 +306,7 @@ def stop(self):
self.exit_now.set()
self.join()
+@testdec.skip_doctest
def magic_history(self, parameter_s = ''):
"""Print input history (_i<n> variables), with most recent last.
View
7 IPython/core/magic.py
@@ -575,6 +575,7 @@ def magic_pinfo2(self, parameter_s='', namespaces=None):
self.shell._inspect('pinfo', parameter_s, detail_level=1,
namespaces=namespaces)
+ @testdec.skip_doctest
def magic_pdef(self, parameter_s='', namespaces=None):
"""Print the definition header for any callable object.
@@ -2618,7 +2619,8 @@ def magic_rehashx(self, parameter_s = ''):
db['syscmdlist'] = syscmdlist
finally:
os.chdir(savedir)
-
+
+ @testdec.skip_doctest
def magic_pwd(self, parameter_s = ''):
"""Return the current working directory path.
@@ -2630,7 +2632,8 @@ def magic_pwd(self, parameter_s = ''):
Out[9]: '/home/tsuser/sprint/ipython'
"""
return os.getcwd()
-
+
+ @testdec.skip_doctest
def magic_cd(self, parameter_s=''):
"""Change the current working directory.
Please sign in to comment.
Something went wrong with that request. Please try again.