##// END OF EJS Templates
add --no-ff to git pull in test_pr...
add --no-ff to git pull in test_pr fast-forward could result in the subsequent `git commit` call failing with nothing to commit.

File last commit:

r5390:c82649ea
r6754:3adb246f
Show More
iplib.py
28 lines | 1021 B | text/x-python | PythonLexer
#!/usr/bin/env python
# encoding: utf-8
"""
A backwards compatibility layer for IPython.iplib.
Previously, IPython had an IPython.iplib module. IPython.iplib has been moved
to IPython.core.iplib and is being refactored. This new module is provided
for backwards compatability. We strongly encourage everyone to start using
the new code in IPython.core.iplib.
"""
#-----------------------------------------------------------------------------
# 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.
#-----------------------------------------------------------------------------
from warnings import warn
msg = """
This module (IPython.iplib) has been moved to a new location
(IPython.core.iplib) and is being refactored. Please update your code
to use the new IPython.core.iplib module"""
warn(msg, category=DeprecationWarning, stacklevel=1)
from IPython.core.iplib import *