Commit 5327fb91 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Get rid of six in ipython_config.py

parent b63eb2c1
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
import six
import sys
import logging
from os.path import join, dirname
python_exe = 'python3' if six.PY3 else 'python2'

c = get_config()

@@ -10,20 +9,24 @@ c.AliasManager.user_aliases = [
	('ls', 'ls --color=auto -lh'),
	('rm', 'rm'),
	('sudo', 'sudo'),
	('setup', '{0} setup.py'.format(python_exe)),
	('setup', '{0} setup.py'.format(sys.executable)),
	('setup2', 'python2 setup.py'),
	('setup3', 'python3 setup.py'),
	('manage', '{0} manage.py'.format(python_exe)),
	('manage', '{0} manage.py'.format(sys.executable)),
	('manage2', 'python2 manage.py'),
	('manage3', 'python3 manage.py'),
	('rpdb', 'screen -c {0} {1} -m rpdb2 -s'
		.format(join(dirname(__file__), 'screen-debug.conf'), python_exe)),
	('python', python_exe),
		.format(join(dirname(__file__), 'screen-debug.conf'), sys.executable)),
	('python', sys.executable),
	('python2', 'python2'),
	('python3', 'python3'),
	('pip', '{0} -m pip'.format(python_exe)),
]

if sys.version_info.major == 2:
	c.AliasManager.user_aliases.extend([
		('pip', '{0} -m pip'.format(sys.executable)),
	])

c.InteractiveShellApp.exec_lines = [
	'from importlib import reload',
]