##// END OF EJS Templates
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ipython branch. This is not a true merge in the formal sense because all history is not coming over with the files. For a detailed history of the added files, please see the ipython1-dev branch or the svn repository on scipy.org that ipython1-dev came from. More specifically, here is what I have done in this commit: 1) Moved the following by hand ipython1.config -> IPython.config ipython1.kernel -> IPython.kernel ipython1.external -> IPython.external ipython1.core -> IPython.kernel.core ipython1.testutils -> IPython.testing ipython1.tools -> IPython.tools 2) Moved IPython.tools.guid -> IPython1.external.guid 3) Renamed: ipython1 -> IPython IPython.core -> IPython.kernel.core IPython.testutils -> IPython.testing 4) Then did a "bzr add" for all the new stuff. That is all folks!

File last commit:

r115:4aa9cf31
r1234:52b55407
Show More
platutils.py
35 lines | 1.1 KiB | text/x-python | PythonLexer
vivainio
Added platutils modules, now only needed for %cd to ...
r107 # -*- coding: utf-8 -*-
""" Proxy module for accessing platform specific utility functions.
Importing this module should give you the implementations that are correct
for your operation system, from platutils_PLATFORMNAME module.
$Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $
"""
#*****************************************************************************
# Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#*****************************************************************************
from IPython import Release
__author__ = '%s <%s>' % Release.authors['Ville']
__license__ = Release.license
vivainio
Corrected platform recognition for win32
r115 import os,sys
vivainio
Added platutils modules, now only needed for %cd to ...
r107
if os.name == 'posix':
from platutils_posix import *
vivainio
Corrected platform recognition for win32
r115 elif sys.platform == 'win32':
vivainio
Added platutils modules, now only needed for %cd to ...
r107 from platutils_win32 import *
else:
from platutils_dummy import *
import warnings
warnings.warn("Platutils not available for platform '%s', some features may be missing" %
os.name)
del warnings