add setup.py MANIFEST.in

pythonbrew/commands/install.py

@@ -36,6 +36,6 @@ class InstallCommand(Command):
             # Install Python
             PythonInstaller(args[0], options).install()
         else:
-            logger.error("Package not found.")
+            logger.info("Unknown python version.")
     
 InstallCommand()

pythonbrew/commands/list.py

@@ -1,6 +1,6 @@
 import re
 from pythonbrew.basecommand import Command
-from pythonbrew.define import PYTHON_PACKAGE_URL, LATEST_VERSIONS_OF_PYTHON
+from pythonbrew.define import PYTHON_VERSION_URL, LATEST_VERSIONS_OF_PYTHON
 from pythonbrew.util import Package
 from pythonbrew.log import logger
 
@@ -31,13 +31,13 @@ class ListCommand(Command):
                 for pkgname in pkgs:
                     logger.info("%s" % pkgname)
             else:
-                print "Package not found. `%s`" % pkg.name
+                print "Python version not found. `%s`" % pkg.name
         else:
             for pkgname in self._get_packages_name(options):
                 logger.info("%s" % pkgname)
     
     def _get_packages_name(self, options):
-        return ["Python-%s" % version for version in sorted(PYTHON_PACKAGE_URL.keys()) 
+        return ["Python-%s" % version for version in sorted(PYTHON_VERSION_URL.keys()) 
                 if(options.all_versions or (not options.all_versions and version in LATEST_VERSIONS_OF_PYTHON))]
 
 ListCommand()

pythonbrew/define.py

@@ -37,11 +37,11 @@ PYTHONBREW_UPDATE_URL = {
     "0.6": "https://github.com/utahta/pythonbrew/tarball/0.6",
 }
 
-# download Python package url
-PYTHON_PACKAGE_URL = {}
-PYTHON_PACKAGE_URL["1.5.2"] = "http://www.python.org/ftp/python/src/py152.tgz"
-PYTHON_PACKAGE_URL["1.6.1"] = "http://www.python.org/download/releases/1.6.1/Python-1.6.1.tar.gz"
-_PYTHON_PACKAGE_VERSIONS = [
+# download Python version url
+PYTHON_VERSION_URL = {}
+PYTHON_VERSION_URL["1.5.2"] = "http://www.python.org/ftp/python/src/py152.tgz"
+PYTHON_VERSION_URL["1.6.1"] = "http://www.python.org/download/releases/1.6.1/Python-1.6.1.tar.gz"
+_PYTHON_VERSIONS_LIST = [
     "2.0", "2.0.1",
     "2.1", "2.1.1", "2.1.2", "2.1.3",
     "2.2", "2.2.1", "2.2.2", "2.2.3",
@@ -53,12 +53,12 @@ _PYTHON_PACKAGE_VERSIONS = [
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2",
 ]
-for version in _PYTHON_PACKAGE_VERSIONS:
-    PYTHON_PACKAGE_URL[version] = "http://www.python.org/ftp/python/%s/Python-%s.tgz" % (version, version)
-del _PYTHON_PACKAGE_VERSIONS
-PYTHON_PACKAGE_URL["3.2a1"] = "http://www.python.org/ftp/python/3.2/Python-3.2a1.tgz"
-PYTHON_PACKAGE_URL["3.2a2"] = "http://www.python.org/ftp/python/3.2/Python-3.2a2.tgz"
-PYTHON_PACKAGE_URL["3.2a3"] = "http://www.python.org/ftp/python/3.2/Python-3.2a3.tgz"
+for version in _PYTHON_VERSIONS_LIST:
+    PYTHON_VERSION_URL[version] = "http://www.python.org/ftp/python/%s/Python-%s.tgz" % (version, version)
+del _PYTHON_VERSIONS_LIST
+PYTHON_VERSION_URL["3.2a1"] = "http://www.python.org/ftp/python/3.2/Python-3.2a1.tgz"
+PYTHON_VERSION_URL["3.2a2"] = "http://www.python.org/ftp/python/3.2/Python-3.2a2.tgz"
+PYTHON_VERSION_URL["3.2a3"] = "http://www.python.org/ftp/python/3.2/Python-3.2a3.tgz"
 
 LATEST_VERSIONS_OF_PYTHON = ['1.5.2', '1.6.1', 
                              '2.0.1', '2.1.3', '2.2.3', '2.3.7', '2.4.6', '2.5.5', '2.6.6', '2.7', 

pythonbrew/downloader.py

@@ -2,7 +2,7 @@ import sys
 import urllib
 import urllib2
 from pythonbrew.util import size_format
-from pythonbrew.define import PYTHON_PACKAGE_URL, PYTHONBREW_UPDATE_URL
+from pythonbrew.define import PYTHON_VERSION_URL, PYTHONBREW_UPDATE_URL
 from pythonbrew.log import logger
 
 def get_response_from_url(url):
@@ -47,7 +47,7 @@ def get_pythonbrew_update_url(version):
         return PYTHONBREW_UPDATE_URL[version]
     return None
 
-def get_python_package_url(version):
-    if PYTHON_PACKAGE_URL.has_key(version):
-        return PYTHON_PACKAGE_URL[version]
+def get_python_version_url(version):
+    if PYTHON_VERSION_URL.has_key(version):
+        return PYTHON_VERSION_URL[version]
     return None

pythonbrew/installer.py

@@ -12,7 +12,7 @@ from pythonbrew.define import PATH_BUILD, PATH_BIN, PATH_DISTS, PATH_PYTHONS,\
     PATH_SCRIPTS_PYTHONBREW_COMMANDS, INSTALLER_ROOT, PATH_BIN_PYTHONBREW,\
     PATH_BIN_PYBREW, ROOT, PATH_LOG, DISTRIBUTE_SETUP_DLSITE, PATH_PATCHES,\
     PATH_PATCHES_MACOSX_PYTHON25, PATH_PATCHES_MACOSX_PYTHON24
-from pythonbrew.downloader import get_python_package_url, Downloader,\
+from pythonbrew.downloader import get_python_version_url, Downloader,\
     get_response_from_url
 from pythonbrew.log import logger
 
@@ -99,9 +99,9 @@ class PythonInstaller(object):
             pkg = Package(splitext(filename)[0])
         else:
             pkg = Package(arg)
-            self.download_url = get_python_package_url(pkg.version)
+            self.download_url = get_python_version_url(pkg.version)
             if not self.download_url:
-                logger.error("Unknown package: `%s`" % pkg.name)
+                logger.info("Unknown python version: `%s`" % pkg.name)
                 sys.exit(1)
             filename = Link(self.download_url).filename
         self.pkg = pkg