Merge pull request #11 from baidu/on-dev-1.7.0

commit change
baidu · Jan 3, 2018 · 7f33040 · 7f33040
2 parents b48cd43 + c32927c
commit 7f33040
Show file tree

Hide file tree

Showing 60 changed files with 88 additions and 74 deletions.
diff --git a/cup/mail.py b/cup/mail.py
@@ -109,9 +109,9 @@ class SmtpMailer(object):  # pylint: disable=R0903
         )
         mailer.sendmail(
             [
-                'maguannan',
-                'liuxuan05',
-                'zhaominghao'
+                '[email protected]',
+                '[email protected]',
+                '[email protected]'
             ],
             'test_img',
             (

diff --git a/cup_test/cup_service_heartbeat_test.py b/cup_test/cup_service_heartbeat_test.py
@@ -7,7 +7,7 @@
 # #############################################################
 """
 :authors:
-    Guannan Ma maguannan@baidu.com @mythmgn
+    Guannan Ma maguannan @mythmgn
 :create_date:
     2015/03/12
 """

diff --git a/cup_test/cup_util_conf_test.py b/cup_test/cup_util_conf_test.py
@@ -7,7 +7,7 @@
 # #############################################################
 """
 :authors:
-    Guannan Ma maguannan@baidu.com @mythmgn
+    Guannan Ma maguannan @mythmgn
 :create_date:
     2015/2/5 15:42
 :modify_date:

diff --git a/docs/_modules/cup/cache.html b/docs/_modules/cup/cache.html
@@ -233,4 +233,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/decorators.html b/docs/_modules/cup/decorators.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.decorators</h1><div class="highlight"><pre>
 
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -301,4 +301,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/err.html b/docs/_modules/cup/err.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.err</h1><div class="highlight"><pre>
 
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_modify_date:</span>
@@ -225,4 +225,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/log.html b/docs/_modules/cup/log.html
@@ -477,4 +477,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/mail.html b/docs/_modules/cup/mail.html
@@ -162,9 +162,9 @@ <h1>Source code for cup.mail</h1><div class="highlight"><pre>
 <span class="sd">        )</span>
 <span class="sd">        mailer.sendmail(</span>
 <span class="sd">            [</span>
-<span class="sd">                &#39;maguannan@baidu.com&#39;,</span>
-<span class="sd">                &#39;liuxuan05@baidu.com&#39;,</span>
-<span class="sd">                &#39;zhaominghao@baidu.com&#39;</span>
+<span class="sd">                &#39;maguannan&#39;,</span>
+<span class="sd">                &#39;liuxuan05&#39;,</span>
+<span class="sd">                &#39;zhaominghao&#39;</span>
 <span class="sd">            ],</span>
 <span class="sd">            &#39;test_img&#39;,</span>
 <span class="sd">            (</span>

diff --git a/docs/_modules/cup/net.html b/docs/_modules/cup/net.html
@@ -263,4 +263,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/net/async/common.html b/docs/_modules/cup/net/async/common.html
@@ -206,4 +206,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/net/async/conn.html b/docs/_modules/cup/net/async/conn.html
@@ -893,4 +893,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/net/async/msg.html b/docs/_modules/cup/net/async/msg.html
@@ -629,4 +629,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/net/async/msgcenter.html b/docs/_modules/cup/net/async/msgcenter.html
@@ -216,4 +216,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/net/route.html b/docs/_modules/cup/net/route.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.net.route</h1><div class="highlight"><pre>
 <span class="c"># #############################################################################</span>
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    YangGuang yangguang07@baidu.com</span>
+<span class="sd">    YangGuang yangguang07</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -374,4 +374,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/oper.html b/docs/_modules/cup/oper.html
@@ -284,4 +284,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/platforms.html b/docs/_modules/cup/platforms.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.platforms</h1><div class="highlight"><pre>
 
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -149,4 +149,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/res/linux.html b/docs/_modules/cup/res/linux.html
@@ -1366,4 +1366,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/services/heartbeat.html b/docs/_modules/cup/services/heartbeat.html
@@ -56,7 +56,7 @@ <h1>Source code for cup.services.heartbeat</h1><div class="highlight"><pre>
 <span class="c"># #############################################################################</span>
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -408,4 +408,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/shell.html b/docs/_modules/cup/shell.html
@@ -410,4 +410,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/shell/expect.html b/docs/_modules/cup/shell/expect.html
@@ -308,4 +308,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/MySQLdb.html b/docs/_modules/cup/thirdp/MySQLdb.html
@@ -189,4 +189,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/MySQLdb/connections.html b/docs/_modules/cup/thirdp/MySQLdb/connections.html
@@ -424,4 +424,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/MySQLdb/converters.html b/docs/_modules/cup/thirdp/MySQLdb/converters.html
@@ -259,4 +259,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/MySQLdb/cursors.html b/docs/_modules/cup/thirdp/MySQLdb/cursors.html
@@ -592,4 +592,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/MySQLdb/times.html b/docs/_modules/cup/thirdp/MySQLdb/times.html
@@ -192,4 +192,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/httplib2.html b/docs/_modules/cup/thirdp/httplib2.html
@@ -1784,4 +1784,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/httplib2/iri2uri.html b/docs/_modules/cup/thirdp/httplib2/iri2uri.html
@@ -199,4 +199,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/httplib2/socks.html b/docs/_modules/cup/thirdp/httplib2/socks.html
@@ -529,4 +529,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/thirdp/pexpect.html b/docs/_modules/cup/thirdp/pexpect.html
@@ -1956,4 +1956,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/timeplus.html b/docs/_modules/cup/timeplus.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.timeplus</h1><div class="highlight"><pre>
 
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -122,4 +122,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/unittest.html b/docs/_modules/cup/unittest.html
@@ -57,7 +57,7 @@ <h1>Source code for cup.unittest</h1><div class="highlight"><pre>
 
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -496,4 +496,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util.html b/docs/_modules/cup/util.html
@@ -56,7 +56,7 @@ <h1>Source code for cup.util</h1><div class="highlight"><pre>
 <span class="c"># #############################################################################</span>
 <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">:author:</span>
-<span class="sd">    Guannan Ma maguannan@baidu.com @mythmgn</span>
+<span class="sd">    Guannan Ma maguannan @mythmgn</span>
 <span class="sd">:create_date:</span>
 <span class="sd">    2014</span>
 <span class="sd">:last_date:</span>
@@ -144,4 +144,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/conf.html b/docs/_modules/cup/util/conf.html
@@ -1118,4 +1118,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/constants.html b/docs/_modules/cup/util/constants.html
@@ -509,4 +509,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/context.html b/docs/_modules/cup/util/context.html
@@ -184,4 +184,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/misc.html b/docs/_modules/cup/util/misc.html
@@ -173,4 +173,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/thread.html b/docs/_modules/cup/util/thread.html
@@ -238,4 +238,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/cup/util/threadpool.html b/docs/_modules/cup/util/threadpool.html
@@ -425,4 +425,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
@@ -121,4 +121,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/cup.html b/docs/cup.html
@@ -605,9 +605,9 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <span class="p">)</span>
 <span class="n">mailer</span><span class="o">.</span><span class="n">sendmail</span><span class="p">(</span>
     <span class="p">[</span>
-        <span class="s">&#39;maguannan@baidu.com&#39;</span><span class="p">,</span>
-        <span class="s">&#39;liuxuan05@baidu.com&#39;</span><span class="p">,</span>
-        <span class="s">&#39;zhaominghao@baidu.com&#39;</span>
+        <span class="s">&#39;maguannan&#39;</span><span class="p">,</span>
+        <span class="s">&#39;liuxuan05&#39;</span><span class="p">,</span>
+        <span class="s">&#39;zhaominghao&#39;</span>
     <span class="p">],</span>
     <span class="s">&#39;test_img&#39;</span><span class="p">,</span>
     <span class="p">(</span>
@@ -1121,4 +1121,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/cup.net.async.html b/docs/cup.net.async.html
@@ -819,4 +819,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
diff --git a/docs/cup.net.html b/docs/cup.net.html
@@ -423,4 +423,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
     </div>
   </body>
-</html>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -233,4 +233,4 @@ <h3>Navigation</h3> @@
           Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.
         </div>
       </body>
-    </html>
+    </html>