--- a/components/python/argparse/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/argparse/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -28,7 +28,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
-COMPONENT_ARCHIVE_URL= http://argparse.googlecode.com/files/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://code.google.com/p/argparse/
COMPONENT_BUGDB= python-mod/argparse
--- a/components/python/cherrypy/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/cherrypy/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -31,7 +31,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
-COMPONENT_ARCHIVE_URL= http://download.cherrypy.org/cherrypy/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/cherrypy
TPNO= 5881
--- a/components/python/ipython/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/ipython/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -32,7 +32,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:60d602637dc5f078b083a4ca5ab64364ba816bd72439844012ed11a30f88228c
-COMPONENT_ARCHIVE_URL= http://archive.ipython.org/release/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/ipython
TPNO= 9640
--- a/components/python/pycurl/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/pycurl/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -31,8 +31,8 @@
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642
-COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
+ sha256:8ef0bf1c0e48f0d193ef8ac4ae4b3596a1e91b6cbf1ff1b25de769fe3782aeb6
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/pycurl
IPS_COMPONENT_VERSION= 7.19.0.1
--- a/components/python/pylint/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/pylint/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -30,7 +30,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:1dce8c143a5aa15e0638887c2b395e2e823223c63ebaf8d5f432a99e44b29f60
-COMPONENT_ARCHIVE_URL= http://download.logilab.org/pub/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= https://bitbucket.org/logilab/pylint
COMPONENT_BUGDB= utility/pylint
--- a/components/python/pylxml/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/pylxml/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -25,15 +25,14 @@
include ../../../make-rules/shared-macros.mk
-COMPONENT_NAME= pylxml
+COMPONENT_NAME= lxml
COMPONENT_VERSION= 2.3.3
COMPONENT_PROJECT_URL= http://lxml.de/
-COMPONENT_SRC_NAME= lxml
-COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:2a3ca34f63b062ee8e059ca2460ac18040ec9622f0a31e143383f0db944ceb36
-COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)files/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/lxml
TPNO= 17146
--- a/components/python/twisted/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/twisted/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -32,7 +32,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
sha256:eda6e0e9e5ef6f6c19ab75bcb094f83a12ee25fe589fbcddf946e8a655c8070b
-COMPONENT_ARCHIVE_URL= http://tmrc.mit.edu/mirror/twisted/$(COMPONENT_NAME)/10.1/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/twisted
TPNO= 9692
--- a/components/python/zope-interface/Makefile Wed Sep 09 12:28:35 2015 +0530
+++ b/components/python/zope-interface/Makefile Wed Sep 09 11:58:35 2015 -0700
@@ -32,7 +32,7 @@
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075
-COMPONENT_ARCHIVE_URL= http://www.zope.org/Products/ZopeInterface/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/zope
TPNO= 7911