diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 78532a6d3..71f977bbf 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -17,6 +17,10 @@ zsh-pip-clear-cache() {
unset piplist
}
+zsh-pip-clean-packages() {
+ sed -nr '/([^<]+).*/\1/p'
+}
+
zsh-pip-cache-packages() {
if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
mkdir -p ${PIP_CACHE_FILE:h}
@@ -28,10 +32,47 @@ zsh-pip-cache-packages() {
for index in $ZSH_PIP_INDEXES ; do
# well... I've already got two problems
curl $index 2>/dev/null | \
- sed -nr '/^([^<]+).*/\1/p' \
+ zsh-pip-clean-packages \
>> $tmp_cache
done
sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE
rm $tmp_cache
fi
}
+
+# A test function that validates the regex against known forms of the simple
+# index. If you modify the regex to make it work for you, you should add a test
+# case in here and make sure that your changes don't break things for someone
+# else.
+zsh-pip-test-clean-packages() {
+ local expected
+ local actual
+ expected="0x10c-asm
+1009558_nester"
+
+ actual=$(echo -n "Simple Index
+0x10c-asm
+1009558_nester
+" | zsh-pip-clean-packages)
+
+ if [[ $actual != $expected ]] ; then
+ echo -e "python's simple index is broken:\n$actual\n !=\n$expected"
+ else
+ echo "python's simple index is fine"
+ fi
+
+ actual=$(echo -n '
+
+ Simple Package Index
+
+
+ 0x10c-asm
+ 1009558_nester
+' | zsh-pip-clean-packages)
+
+ if [[ $actual != $expected ]] ; then
+ echo -e "the djangopypi2 index is broken:\n$actual\n !=\n$expected"
+ else
+ echo "the djangopypi2 index is fine"
+ fi
+}