Remove more broken urlparse.urljoin examples.

chromite/lib/binpkg.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Adapted from portage/getbinpkg.py -- Portage binary-package helper functions
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import operator
 import os
 import tempfile
 import time
 import urllib2
-import urlparse
 
 class PackageIndex(object):
   """A parser for the Portage Packages index file.
 
   The Portage Packages index file serves to keep track of what packages are
   included in a tree. It contains the following sections:
     1) The header. The header tracks general key/value pairs that don't apply
        to any specific package. E.g., it tracks the base URL of the packages
        file, and the number of packages included in the file. The header is
        terminated by a blank line.
@@ skipping 22 matching lines @@
 
     Args:
       db: Dictionary to populate with SHA1 -> URL mapping for packages.
     """
 
     uri = self.header['URI']
     for pkg in self.packages:
       cpv, sha1 = pkg['CPV'], pkg.get('SHA1')
       if sha1:
         path = pkg.get('PATH', cpv + '.tbz2')
-        db[sha1] = urlparse.urljoin(uri, path)
+        db[sha1] = '%s/%s' % (uri.rstrip('/'), path)
 
   def _ReadPkgIndex(self, pkgfile):
     """Read a list of key/value pairs from the Packages file into a dictionary.
 
     Both header entries and package entries are lists of key/value pairs, so
     they can both be read by this function. Entries can be terminated by empty
     lines or by the end of the file.
 
     This function will read lines from the specified file until it encounters
     the a blank line or the end of the file.
@@ skipping 126 matching lines @@
 
     Args:
       base_uri: Base URI for all packages in the file. We set
         self.header['URI'] to this value, so all packages must live under
         this directory.
       path_prefix: Path prefix to use for all current packages in the file.
         This will be added to the beginning of the path for every package.
     """
     self.header['URI'] = base_uri
     for pkg in self.packages:
-      pkg['PATH'] = urlparse.urljoin(path_prefix, pkg['CPV'] + '.tbz2')
+      pkg['PATH'] = '%s/%s' % (path_prefix.rstrip('/'), pkg['CPV'] + '.tbz2')
 
   def Write(self, pkgfile):
     """Write a packages file to disk.
 
     If 'modified' flag is set, the TIMESTAMP and PACKAGES fields in the header
     will be updated before writing to disk.
 
     Args:
       pkgfile: A python file object.
     """
@@ skipping 55 matching lines @@
   """Grab the latest binary package database from the specified URL.
 
   Args:
     binhost_url: Base URL of remote packages (PORTAGE_BINHOST).
 
   Returns:
     A PackageIndex object, if the Packages file can be retrieved. If the
     server returns status code 404, None is returned.
   """
 
-  url = urlparse.urljoin(binhost_url, 'Packages')
+  url = '%s/Packages' % binhost_url.rstrip('/')
   try:
     f = _RetryUrlOpen(url)
   except urllib2.HTTPError as e:
     if e.code == 404:
       return None
     raise
 
   pkgindex = PackageIndex()
   pkgindex.Read(f)
   pkgindex.header.setdefault('URI', binhost_url)
   f.close()
   return pkgindex
 
 
 def GrabLocalPackageIndex(package_path):
   """Read a local packages file from disk into a PackageIndex() object.
 
   Args:
     package_path: Directory containing Packages file.
 
   Returns:
     A PackageIndex object.
   """
   packages_file = file(os.path.join(package_path, 'Packages'))
   pkgindex = PackageIndex()
   pkgindex.Read(packages_file)
   packages_file.close()
   return pkgindex