369169d6774f

--- a/.zshrc	Fri Dec 17 16:38:19 2010 -0500
+++ b/.zshrc	Sat Dec 18 11:15:34 2010 -0500
@@ -18,28 +18,32 @@
 export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
 export PATH="/opt/subversion/bin:${PATH}"
-export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
-export PATH="${PATH}:/usr/local/Cellar/python/2.6.4/bin"
-export PATH="${PATH}:/usr/local/Cellar/python/2.6.5/bin"
-export PATH="${PATH}:/usr/local/Cellar/python/2.7/bin"
-export WORKON_HOME="${HOME}/lib/virtualenvs"
 export GREP_OPTIONS='--color=auto'
 export HISTSIZE=1000
 export HISTFILESIZE=1000
 export HISTCONTROL=erasedups
-export PYTHONSTARTUP="$HOME/.pythonrc.py"
 export COMMAND_MODE=unix2003
 export R_LIBS="$HOME/lib/r"
 export BAT_CHARGE="$HOME/bin/batcharge.py"
 export RUBYOPT=rubygems
 export CLASSPATH=$CLASSPATH:/usr/local/Cellar/clojure-contrib/1.2.0/clojure-contrib.jar
-export PIP_DOWNLOAD_CACHE=~/.pip/cache
+
+# Python variables -----------------------------------------------------------
+export PIP_DOWNLOAD_CACHE="$HOME/.pip/cache"
+export PYTHONSTARTUP="$HOME/.pythonrc.py"
+export WORKON_HOME="${HOME}/lib/virtualenvs"
+export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
+export PATH="${PATH}:/usr/local/Cellar/python/2.7.1/bin"
+export PATH="${PATH}:/usr/local/Cellar/python/2.7/bin"
+export PATH="${PATH}:/usr/local/Cellar/python/2.6.5/bin"
+export PATH="${PATH}:/usr/local/Cellar/python/2.6.4/bin"
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7.1/site-packages"
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
 
 # Mercurial variables --------------------------------------------------------
 export PATH="$HOME/lib/hg/hg-stable:$PATH"
 export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
-export PYTHONPATH="/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
-export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
 
 # Extra shell extensions like z and tab completion for Mercurial -------------
 source ~/lib/z/z.sh
@@ -60,5 +64,8 @@
 test -n "${BCVI_CONF}"  && alias suvi="EDITOR='bcvi -c viwait' sudoedit"
 test -n "${BCVI_CONF}"  && alias bcp="bcvi -c scpd"
 
+# MacPorts
+export PATH="$PATH:/opt/local/bin"
+
 # Local Settings -------------------------------------------------------------
 if [[ -s $HOME/.zshrc_local ]] ; then source $HOME/.zshrc_local ; fi