Merge pull request pypa#9315 from pradyunsg/better-search-errors

pradyunsg · Jan 23, 2021 · e4edf1f · e4edf1f
1 parent ae52918
commit e4edf1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/news/9315.feature.rst b/news/9315.feature.rst
@@ -0,0 +1 @@
+Improve presentation of XMLRPC errors in pip search.
diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
@@ -79,7 +79,14 @@ def search(self, query, options):
 
         transport = PipXmlrpcTransport(index_url, session)
         pypi = xmlrpc_client.ServerProxy(index_url, transport)
-        hits = pypi.search({'name': query, 'summary': query}, 'or')
+        try:
+            hits = pypi.search({'name': query, 'summary': query}, 'or')
+        except xmlrpc_client.Fault as fault:
+            message = "XMLRPC request failed [code: {code}]\n{string}".format(
+                code=fault.faultCode,
+                string=fault.faultString,
+            )
+            raise CommandError(message)
         return hits