From: Hugh Brown <hbrown@amplify.com>
Date: Thu, 10 Oct 2013 21:00:42 +0000 (-0400)
Subject: Merge multiple docstrings
X-Git-Tag: v0.2.23~92^2~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1253f58cc9333a4dd036609964172ee0efd999b2;p=tools%2Fpython-jenkinsapi.git

Merge multiple docstrings
---

diff --git a/jenkinsapi/api.py b/jenkinsapi/api.py
index b34cff2..c6bf3c6 100644
--- a/jenkinsapi/api.py
+++ b/jenkinsapi/api.py
@@ -174,14 +174,13 @@ def install_artifacts(artifacts, dirstruct, installdir, basestaticurl):
 
 def search_artifact_by_regexp(jenkinsurl, jobid, artifactRegExp):
     '''
+    Search the entire history of a hudson job for a build which has an artifact whose
+    name matches a supplied regular expression. Return only that artifact.
+
     @param jenkinsurl: The base URL of the jenkins server
     @param jobid: The name of the job we are to search through
     @param artifactRegExp: A compiled regular expression object (not a re-string)
     '''
-    """
-    Search the entire history of a hudson job for a build which has an artifact whose
-    name matches a supplied regular expression. Return only that artifact.
-    """
     J = Jenkins(jenkinsurl)
     j = J[jobid]