From 6430efa0bcf9379b50ccaea0e1c2b2ea347ea212 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Oct 2009 22:13:04 +0000 Subject: Bug #274497 - Misc spelling, grammar, and terminology fixes, including URL -> URI and FOO's -> FOOs. svn path=/main/trunk/; revision=14531 --- pym/portage/__init__.py | 2 +- pym/portage/dbapi/porttree.py | 2 +- pym/portage/getbinpkg.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a0c9277a9..9224b7138 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6578,7 +6578,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, @type dbkey: Dict or String @param use_cache: Enables the cache @type use_cache: Boolean - @param fetchall: Used to wrap fetch(), fetches all URI's (even ones invalid due to USE conditionals) + @param fetchall: Used to wrap fetch(), fetches all URIs (even ones invalid due to USE conditionals) @type fetchall: Boolean @param tree: Which tree to use ('vartree','porttree','bintree', etc..), defaults to 'porttree' @type tree: String diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index ef0b8a694..e955a6a57 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -433,7 +433,7 @@ class portdbapi(dbapi): def getRepositories(self): """ This function is required for GLEP 42 compliance; it will return a list of - repository ID's + repository IDs TreeMap = {id: path} """ return [k for k in self.treemap if k] diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 69ae56fa5..42938de99 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -107,7 +107,7 @@ def create_conn(baseurl,conn=None): parts = baseurl.split("://",1) if len(parts) != 2: - raise ValueError(_("Provided URL does not " + raise ValueError(_("Provided URI does not " "contain protocol identifier. '%s'") % baseurl) protocol,url_parts = parts del parts @@ -315,7 +315,7 @@ def match_in_array(array, prefix="", suffix="", match_both=1, allow_overlap=0): def dir_get_list(baseurl,conn=None): """(baseurl[,connection]) -- Takes a base url to connect to and read from. - URL should be in the for ://[:port] + URI should be in the form ://[:port] Connection is used for persistent connection instances.""" if not conn: @@ -363,7 +363,7 @@ def dir_get_list(baseurl,conn=None): def file_get_metadata(baseurl,conn=None, chunk_size=3000): """(baseurl[,connection]) -- Takes a base url to connect to and read from. - URL should be in the for ://[:port] + URI should be in the form ://[:port] Connection is used for persistent connection instances.""" if not conn: @@ -414,7 +414,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000): def file_get(baseurl,dest,conn=None,fcmd=None): """(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from. - URL should be in the for ://[user[:pass]@][:port]""" + URI should be in the form ://[user[:pass]@][:port]""" if not fcmd: return file_get_lib(baseurl,dest,conn) @@ -442,7 +442,7 @@ def file_get(baseurl,dest,conn=None,fcmd=None): def file_get_lib(baseurl,dest,conn=None): """(baseurl[,connection]) -- Takes a base url to connect to and read from. - URL should be in the for ://[:port] + URI should be in the form ://[:port] Connection is used for persistent connection instances.""" if not conn: -- cgit v1.2.3-1-g7c22