瀏覽代碼

Last commit made test invalid and broke the build

Ask Solem 14 年之前
父節點
當前提交
0b1bc043ac
共有 11 個文件被更改,包括 41 次插入285 次删除
  1. 1 1
      celery/task/base.py
  2. 1 1
      celery/tests/test_worker_scheduler.py
  3. 二進制
      docs/homepage/bg.png
  4. 二進制
      docs/homepage/bg_content.png
  5. 二進制
      docs/homepage/bg_grass.png
  6. 二進制
      docs/homepage/bg_top.png
  7. 39 17
      docs/homepage/index.html
  8. 二進制
      docs/homepage/logo.jpg
  9. 二進制
      docs/homepage/logo.png
  10. 0 197
      docs/homepage/main.css
  11. 0 69
      docs/homepage/trac.css

+ 1 - 1
celery/task/base.py

@@ -333,7 +333,6 @@ class Task(object):
 
         :returns :class:`celery.result.AsyncResult`:
 
-
         """
         return apply_async(self, args, kwargs, **options)
 
@@ -413,6 +412,7 @@ class Task(object):
 
         :param args: positional arguments passed on to the task.
         :param kwargs: keyword arguments passed on to the task.
+
         :rtype :class:`celery.result.EagerResult`:
 
         See :func:`celery.execute.apply`.

+ 1 - 1
celery/tests/test_worker_scheduler.py

@@ -32,7 +32,7 @@ class test_Scheduler(unittest.TestCase):
         sched.enter(MockItem("foo"), eta=now, callback=callback)
 
         remaining = iter(sched).next()
-        self.assertEqual(remaining, 0)
+        self.assertIsNone(remaining)
         self.assertTrue(callback_called[0])
         self.assertEqual(ready_queue.get_nowait().task_id, "foo")
 

二進制
docs/homepage/bg.png


二進制
docs/homepage/bg_content.png


二進制
docs/homepage/bg_grass.png


二進制
docs/homepage/bg_top.png


+ 39 - 17
docs/homepage/index.html

@@ -1,16 +1,16 @@
-<!DOCTYPE html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
 <meta charset="utf-8">
 <meta name="keywords" content="task queue, job queue, asynchronous, rabbitmq, amqp,
 redis, django, python, webhooks, queue, distributed">
 <meta name="description" content="open source distributed task queue" >
-<link rel="icon" type="image/png" href="favicon.png">
+<link rel="icon" type="image/png" href="favicon0.png">
 <meta name="viewport" content="width=320, user-scalable=no">
 <link rel="apple-touch-icon" href="favicon_64.png"/>
 <title>Celery - The Distributed Task Queue</title>
-<link rel="stylesheet" href="main.css"/>
-<link rel="stylesheet" href="trac.css"/>
+<link rel="stylesheet" href="main0000.css"/>
+<link rel="stylesheet" href="trac0000.css"/>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
@@ -22,12 +22,25 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 
 
+
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+
+<!--[if IE 8]>
+<style>
+  .column{
+    display:inline;
+    zoom: 1;
+    width: 500px;
+  }
+</style>
+<![endif]-->
+
 </head>
 
 <body>
 <div id="navbar">
   <div class="iStretch">
-    <div class="link" id="current"><a href="#">Home</a></div>
+    <div class="link" id="current"><a href="">Home</a></div>
     <div class="link"><a href="http://github.com/ask/celery">Code</a></div>
     <div class="link"><a href="http://celeryq.org/docs/">Documentation</a></div>
     <div class="link"><a href="http://celeryq.org/docs/getting-started/">Tutorials</a></div>
@@ -38,7 +51,7 @@ pageTracker._trackPageview();
 <div class="iStretch">
 
   <div id="topcontainer">
-  <ul>
+    <ul>
     <li>Background Processing
     <li>Distributed
     <li>Asynchronous/Synchronous
@@ -52,8 +65,8 @@ pageTracker._trackPageview();
 
     <div class="column">
         <h2>Distributed Task Queue</h2>
-        <p> Celery is an asynchronous task queue/job queue based on distributed message passing.
-        It is focused on real-time operation, but supports scheduling as well.</p>
+        <p> Celery is an open source asynchronous task queue/job queue based on distributed message
+        passing.  It is focused on real-time operation, but supports scheduling as well.</p>
 
         <p>The execution units, called tasks, are executed concurrently on a single or
         more worker servers. Tasks can execute asynchronously (in the background) or synchronously
@@ -66,12 +79,12 @@ pageTracker._trackPageview();
         It can also <a href="http://celeryq.org/docs/userguide/remote-tasks.html"
         >operate with other languages</a> using webhooks.</p>
 
-        <p>The recommended message broker is <a href="http://rabbitmq.com">RabbitMQ</a>,
-        but support for <a href="http://redisdb.com">Redis</a> and databases
+        <p>The recommended message broker is <a href="http://rabbitmq.com/">RabbitMQ</a>,
+        but support for <a href="http://redisdb.com/">Redis</a> and databases
         is also available.</p>
 
         <p>You may also be pleased to know that full
-        <a href="http://pypi.python.org/pypi/django-celery">Django integration</a>exists,
+        <a href="http://pypi.python.org/pypi/django-celery">Django integration</a> exists,
         delivered by the django-celery package.</p>
 
         <h3>Example</h3>
@@ -201,7 +214,7 @@ pageTracker._trackPageview();
       <p>Celery 1.0 has finally been released! It is available on <a
           href="http://pypi.python.org/pypi/celery/1.0.0">PyPI</a> for
       downloading. You can also install it via <code>pip install
-          celery</code>. You can read the announcement <a href="celery_1.0_released.html">here</a>.
+          celery</code>. You can read the announcement <a href="http://celeryproject.org/celery_1.0_released.html">here</a>.
       <hr>
       </span>
 
@@ -218,7 +231,7 @@ pageTracker._trackPageview();
       <span class="newsitem">
       <h2>New website.</h2>
       <h4>By <a href="http://twitter.com/asksol">@asksol</a> on 2010-02-08</h4>
-      <p>We finally got a home page. Big thanks to <a href="http://helmersworks.com">Jan Henrik Helmers</a>
+      <p>We finally got a home page. Big thanks to <a href="http://helmersworks.com/">Jan Henrik Helmers</a>
       <hr>
       </span>
 
@@ -227,13 +240,22 @@ pageTracker._trackPageview();
   </div>
 
  <div id="credits">
-     <div class="iStretch">Copyright (c) 2009-2010, <a href="http://twitter.com/asksol">Ask Solem</a> and
-         <a href="http://github.com/ask/celery/blob/master/AUTHORS">contributors</a>.<br>
- Page design by <a href="http://www.helmersworks.com/">Jan Henrik Helmers</a>
-   </div>
+   <ul>
+     <li>
+       <strong>Copyright (c) 2009-2010</strong>
+       <span><a href="http://twitter.com/asksol">Ask Solem</a> and
+         <a href="http://github.com/ask/celery/blob/master/AUTHORS">contributors</a>.</span>
+     </li>
+     <li>
+       <strong>Web Design</strong>
+       <span><a href="http://www.helmersworks.com/">Jan Henrik Helmers</a></span>
+     </li>
+   </ul>
  </div>
 
 
 </div>
 </body>
 </html>
+
+<!-- This document saved from http://celeryproject.org/ -->

二進制
docs/homepage/logo.jpg


二進制
docs/homepage/logo.png


+ 0 - 197
docs/homepage/main.css

@@ -1,197 +0,0 @@
-body {
-  background: #e1edc1 url(bg.png) 0 0 repeat;
-  color: #000;
-  font-family: "Helvetica Neue", arial, sans-serif;
-  line-height: 1.75em;
-  font-size: 1em;
-  margin: 0;
-}
-
-.iStretch {
-  margin: 0 auto;
-  min-width: 600px;
-  max-width: 850px;
-  width: 80%;
-}
-
-.highlight {
-    background: #222;
-    border: 5px solid #222;
-    border-radius: 3px;
-}
-
-.column {
-    line-height: 1.50em;
-}
-
-#navbar {
-  line-height: 1.9em;
-  position: fixed;
-  background: transparent url(bg_top.png) 0 100% repeat-x;
-  height: 40px;
-  top: 0;
-  left: 0;
-  right: 0;
-  color: #e1edc1;
-  text-shadow: 0 1px 1px #000;
-}
-
-#navbar a, #credits a {
-  color: #fff;
-  text-decoration: none;
-}
-
-#navbar .iStretch div {
-  float: right;
-  padding: 0 15px;
-  margin: 0 1px;
-  height: 32px;
-  text-align: center;
-}
-
-#navbar div:hover {
-  background: #314016;
-}
-
-#navbar .iStretch div#current {
-  float: left;
-  background-color: #314016;
-}
-
-#topcontainer {
-  padding-top: 25px;
-  padding-bottom: 20px;
-  height: 165px;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-  background: #466807 url(logo.png) 50% 100% repeat-x;
-  box-shadow: 0 0 25px #618224;
-  -webkit-box-shadow: 0 0 25px #618224;
-  -moz-box-shadow: 0 0 25px #618224;
-  text-align: right;
-}
-
-#topcontainer ul{
-  padding: 5px 20px;
-  font-size: 0.9em;
-  line-height: 1.75em;  
-  color: #fff;
-  list-style: none;
-  text-shadow: 0 1px 1px #000;
-}
-
-#contentcontainer {
-  border: 1px solid #fff;
-  background: #e1edc1 url(bg_content.png) 0 0 repeat;
-  box-shadow: 0 0 25px #618224;
-  -webkit-box-shadow: 0 0 25px #618224;
-  -moz-box-shadow: 0 0 25px #618224;
-}
-
-.column {
-  display: inline-block;
-  width: 60%;
-  padding-right: 2.9%;
-  padding-left: 2%;
-  font-size: 0.9em;
-  vertical-align: top;
-}
-
-.newsitem h2 {
-    font-size: 1.1em;
-}
-
-.column:last-child {
-  border-left: 1px solid #fff;
-  width: 28%;
-}
-
-#credits {
-  bottom: 0;
-  left: 0;
-  right: 0;
-  position: fixed;
-  background: transparent url(bg_grass.png) 50% 0 repeat-x;
-  height: 30px;
-  padding-top: 45px;
-  line-height: 1.2em;
-  color: #e1edc1;
-  text-shadow: 0 1px 1px #000;
-  font-size: 0.7em;
-}
-
-/* Restyling default elements */
-
-.column a {
-  background-color: #c1d29a;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  padding: 0px 4px;
-  line-height: 0;
-  text-decoration: none;
-  color: #000;
-}
-
-.column a:hover {
-  background-color: #acbc85;
-}
-
-h2 {
-  margin-bottom: 0;
-  font-size: 1.8em;
-  letter-spacing: -0.03em;
-  text-shadow: 0 1px #fff;
-}
-
-h3 {
-  margin-bottom: 0;
-  font-size: 1.2em;
-  text-shadow: 0 1px #fff;
-}
-
-.newsitem h2 {
-  font-size: 1.2em;
-  background-color: #314016;
-  background-color: rgba(49,64,22,0.25);
-  border-bottom: 2px solid #314016;
-  line-height: 1em;
-  letter-spacing: 0;
-  text-shadow: none;
-}
-
-.newsitem h4 {
-  font-size: 0.8em;
-  margin: 0;
-  line-height: 2em;
-  margin-bottom: -0.5em;
-  font-weight: normal;
-}
-
-p.introduction {
-  line-height: 1.6em;
-  font-weight: bold;
-}
-
-hr {
-  border-top: 1px solid #547a1a;
-  border-bottom: 1px solid #f1f5dd;
-
-}
-
-.hidden {
-    color: #e1edc1;
-}
-
-
-/* Hacking it up for the iPod */
-@media handheld, only screen and (max-device-width: 480px) {
-  body {}
-  #navbar {background: transparent}
-  #navbar a {background: transparent}
-  #topcontainer ul {display: none}
-  #credits {position: static; background: transparent}
-  .iStretch {margin: auto 20px !important}
-}
-

+ 0 - 69
docs/homepage/trac.css

@@ -1,69 +0,0 @@
-.hll { background-color: #404040 }
-.c { color: #999999; font-style: italic } /* Comment */
-.err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.g { color: #d0d0d0 } /* Generic */
-.k { color: #6ab825; font-weight: bold } /* Keyword */
-.l { color: #d0d0d0 } /* Literal */
-.n { color: #d0d0d0 } /* Name */
-.o { color: #d0d0d0 } /* Operator */
-.x { color: #d0d0d0 } /* Other */
-.p { color: #d0d0d0 } /* Punctuation */
-.cm { color: #999999; font-style: italic } /* Comment.Multiline */
-.cp { color: #cd2828; font-weight: bold } /* Comment.Preproc */
-.c1 { color: #999999; font-style: italic } /* Comment.Single */
-.cs { color: #e50808; font-weight: bold; background-color: #520000 } /* Comment.Special */
-.gd { color: #d22323 } /* Generic.Deleted */
-.ge { color: #d0d0d0; font-style: italic } /* Generic.Emph */
-.gr { color: #d22323 } /* Generic.Error */
-.gh { color: #ffffff; font-weight: bold } /* Generic.Heading */
-.gi { color: #589819 } /* Generic.Inserted */
-.go { color: #cccccc } /* Generic.Output */
-.gp { color: #aaaaaa } /* Generic.Prompt */
-.gs { color: #d0d0d0; font-weight: bold } /* Generic.Strong */
-.gu { color: #ffffff; text-decoration: underline } /* Generic.Subheading */
-.gt { color: #d22323 } /* Generic.Traceback */
-.kc { color: #6ab825; font-weight: bold } /* Keyword.Constant */
-.kd { color: #6ab825; font-weight: bold } /* Keyword.Declaration */
-.kn { color: #6ab825; font-weight: bold } /* Keyword.Namespace */
-.kp { color: #6ab825 } /* Keyword.Pseudo */
-.kr { color: #6ab825; font-weight: bold } /* Keyword.Reserved */
-.kt { color: #6ab825; font-weight: bold } /* Keyword.Type */
-.ld { color: #d0d0d0 } /* Literal.Date */
-.m { color: #3677a9 } /* Literal.Number */
-.s { color: #ed9d13 } /* Literal.String */
-.na { color: #bbbbbb } /* Name.Attribute */
-.nb { color: #24909d } /* Name.Builtin */
-.nc { color: #447fcf; text-decoration: underline } /* Name.Class */
-.no { color: #40ffff } /* Name.Constant */
-.nd { color: #ffa500 } /* Name.Decorator */
-.ni { color: #d0d0d0 } /* Name.Entity */
-.ne { color: #bbbbbb } /* Name.Exception */
-.nf { color: #447fcf } /* Name.Function */
-.nl { color: #d0d0d0 } /* Name.Label */
-.nn { color: #447fcf; text-decoration: underline } /* Name.Namespace */
-.nx { color: #d0d0d0 } /* Name.Other */
-.py { color: #d0d0d0 } /* Name.Property */
-.nt { color: #6ab825; font-weight: bold } /* Name.Tag */
-.nv { color: #40ffff } /* Name.Variable */
-.ow { color: #6ab825; font-weight: bold } /* Operator.Word */
-.w { color: #666666 } /* Text.Whitespace */
-.mf { color: #3677a9 } /* Literal.Number.Float */
-.mh { color: #3677a9 } /* Literal.Number.Hex */
-.mi { color: #3677a9 } /* Literal.Number.Integer */
-.mo { color: #3677a9 } /* Literal.Number.Oct */
-.sb { color: #ed9d13 } /* Literal.String.Backtick */
-.sc { color: #ed9d13 } /* Literal.String.Char */
-.sd { color: #ed9d13 } /* Literal.String.Doc */
-.s2 { color: #ed9d13 } /* Literal.String.Double */
-.se { color: #ed9d13 } /* Literal.String.Escape */
-.sh { color: #ed9d13 } /* Literal.String.Heredoc */
-.si { color: #ed9d13 } /* Literal.String.Interpol */
-.sx { color: #ffa500 } /* Literal.String.Other */
-.sr { color: #ed9d13 } /* Literal.String.Regex */
-.s1 { color: #ed9d13 } /* Literal.String.Single */
-.ss { color: #ed9d13 } /* Literal.String.Symbol */
-.bp { color: #24909d } /* Name.Builtin.Pseudo */
-.vc { color: #40ffff } /* Name.Variable.Class */
-.vg { color: #40ffff } /* Name.Variable.Global */
-.vi { color: #40ffff } /* Name.Variable.Instance */
-.il { color: #3677a9 } /* Literal.Number.Integer.Long */