[Jython-checkins] jython: Fixed various other __doc__-issues in org.python.modules.itertools.

stefan.richthofer jython-checkins at python.org
Thu Nov 20 00:46:57 CET 2014


https://hg.python.org/jython/rev/f9cc96d0f517
changeset:   7419:f9cc96d0f517
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Thu Nov 20 00:46:39 2014 +0100
summary:
  Fixed various other __doc__-issues in org.python.modules.itertools.

files:
  src/org/python/modules/itertools/chain.java                       |  14 ++--
  src/org/python/modules/itertools/combinationsWithReplacement.java |  12 ++--
  src/org/python/modules/itertools/compress.java                    |  13 ++--
  src/org/python/modules/itertools/count.java                       |  10 +--
  src/org/python/modules/itertools/cycle.java                       |  11 ++--
  src/org/python/modules/itertools/dropwhile.java                   |  11 ++--
  src/org/python/modules/itertools/groupby.java                     |   7 +-
  src/org/python/modules/itertools/ifilter.java                     |  11 ++--
  src/org/python/modules/itertools/ifilterfalse.java                |  12 ++--
  src/org/python/modules/itertools/imap.java                        |  15 +++--
  src/org/python/modules/itertools/islice.java                      |   7 +-
  src/org/python/modules/itertools/itertools.java                   |   2 +-
  src/org/python/modules/itertools/izip.java                        |  17 +++---
  src/org/python/modules/itertools/izipLongest.java                 |  18 +++---
  src/org/python/modules/itertools/permutations.java                |   9 +--
  src/org/python/modules/itertools/product.java                     |  25 ++++-----
  src/org/python/modules/itertools/repeat.java                      |  10 ++--
  src/org/python/modules/itertools/starmap.java                     |  11 ++--
  src/org/python/modules/itertools/takewhile.java                   |  11 ++--
  19 files changed, 107 insertions(+), 119 deletions(-)


diff --git a/src/org/python/modules/itertools/chain.java b/src/org/python/modules/itertools/chain.java
--- a/src/org/python/modules/itertools/chain.java
+++ b/src/org/python/modules/itertools/chain.java
@@ -15,17 +15,17 @@
 
 import java.util.ArrayList;
 
- at ExposedType(name = "itertools.chain", base = PyObject.class)
+ at ExposedType(name = "itertools.chain", base = PyObject.class, doc = chain.chain_doc)
 public class chain extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(chain.class);
     private itertools.ItertoolsIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "chain(*iterables) --> chain object\n\nReturn a chain object "
-                    + "whose .next() method returns elements from the\nfirst iterable until it is exhausted, then elements"
-                    + " from the next\niterable, until all of the iterables are exhausted.");
+    public static final String chain_doc =
+        "chain(*iterables) --> chain object\n\n" +
+        "Return a chain object whose .next() method returns elements from the\n" +
+        "first iterable until it is exhausted, then elements from the next\n" +
+        "iterable, until all of the iterables are exhausted.";
 
     public chain() {
         super();
@@ -94,4 +94,4 @@
         return doNext(__iternext__());
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/org/python/modules/itertools/combinationsWithReplacement.java b/src/org/python/modules/itertools/combinationsWithReplacement.java
--- a/src/org/python/modules/itertools/combinationsWithReplacement.java
+++ b/src/org/python/modules/itertools/combinationsWithReplacement.java
@@ -13,18 +13,18 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.combinations_with_replacement", base = PyObject.class)
+ at ExposedType(name = "itertools.combinations_with_replacement", base = PyObject.class,
+    doc = combinationsWithReplacement.combinations_with_replacement_doc)
 public class combinationsWithReplacement extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(combinationsWithReplacement.class);
     private itertools.ItertoolsIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String combinations_with_replacement_doc =
         "combinations_with_replacement(iterable, r) --> combinations_with_replacement object\n\n" +
-            "Return successive r-length combinations of elements in the iterable\n" +
-            "allowing individual elements to have successive repeats.\n" +
-            "combinations_with_replacement('ABC', 2) --> AA AB AC BB BC CC");
+        "Return successive r-length combinations of elements in the iterable\n" +
+        "allowing individual elements to have successive repeats.\n" +
+        "combinations_with_replacement('ABC', 2) --> AA AB AC BB BC CC";
 
     public combinationsWithReplacement() {
         super();
diff --git a/src/org/python/modules/itertools/compress.java b/src/org/python/modules/itertools/compress.java
--- a/src/org/python/modules/itertools/compress.java
+++ b/src/org/python/modules/itertools/compress.java
@@ -12,18 +12,17 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.compress", base = PyObject.class)
+ at ExposedType(name = "itertools.compress", base = PyObject.class, doc = compress.compress_doc)
 public class compress extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(compress.class);
     private itertools.ItertoolsIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "compress(data, selectors) --> iterator over selected data\n\n" +
-                    "Return data elements corresponding to true selector elements.\n" +
-                    "Forms a shorter iterator from selected data elements using the\n" +
-                    "selectors to choose the data elements.");
+    public static final String compress_doc =
+        "compress(data, selectors) --> iterator over selected data\n\n" +
+        "Return data elements corresponding to true selector elements.\n" +
+        "Forms a shorter iterator from selected data elements using the\n" +
+        "selectors to choose the data elements.";
 
     public compress() {
         super();
diff --git a/src/org/python/modules/itertools/count.java b/src/org/python/modules/itertools/count.java
--- a/src/org/python/modules/itertools/count.java
+++ b/src/org/python/modules/itertools/count.java
@@ -9,15 +9,12 @@
 import org.python.core.PyString;
 import org.python.core.PyTuple;
 import org.python.core.PyType;
-import org.python.expose.ExposedClassMethod;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedType;
 
-import java.util.ArrayList;
-
- at ExposedType(name = "itertools.count", base = PyObject.class)
+ at ExposedType(name = "itertools.count", base = PyObject.class, doc = count.count_doc)
 public class count extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(count.class);
@@ -25,8 +22,7 @@
     private int counter;
     private int stepper;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String count_doc =
         "count(start=0, step=1) --> count object\n\n" +
         "Return a count object whose .next() method returns consecutive values.\n" +
         "  Equivalent to:\n" +
@@ -35,7 +31,7 @@
         "      x = firstval\n" +
         "      while 1:\n" +
         "          yield x\n" +
-        "          x += step\n");
+        "          x += step\n";
 
     public count(PyType subType) {
         super(subType);
diff --git a/src/org/python/modules/itertools/cycle.java b/src/org/python/modules/itertools/cycle.java
--- a/src/org/python/modules/itertools/cycle.java
+++ b/src/org/python/modules/itertools/cycle.java
@@ -13,17 +13,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
- at ExposedType(name = "itertools.count", base = PyObject.class)
+ at ExposedType(name = "itertools.count", base = PyObject.class, doc = cycle.cycle_doc)
 public class cycle extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(cycle.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "cycle(iterable) --> cycle object\n\n" +
-            "Return elements from the iterable until it is exhausted.\n" +
-            "Then repeat the sequence indefinitely.");
+    public static final String cycle_doc =
+        "cycle(iterable) --> cycle object\n\n" +
+        "Return elements from the iterable until it is exhausted.\n" +
+        "Then repeat the sequence indefinitely.";
 
     public cycle() {
         super();
diff --git a/src/org/python/modules/itertools/dropwhile.java b/src/org/python/modules/itertools/dropwhile.java
--- a/src/org/python/modules/itertools/dropwhile.java
+++ b/src/org/python/modules/itertools/dropwhile.java
@@ -11,7 +11,7 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.dropwhile", base = PyObject.class)
+ at ExposedType(name = "itertools.dropwhile", base = PyObject.class, doc = dropwhile.dropwhile_doc)
 public class dropwhile extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(dropwhile.class);
@@ -30,11 +30,10 @@
         dropwhile___init__(predicate, iterable);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-        "dropwhile(predicate, iterable) --> dropwhile object\n\n"
-            + "Drop items from the iterable while predicate(item) is true.\n"
-            + "Afterwards, return every element until the iterable is exhausted.");
+    public static final String dropwhile_doc =
+        "dropwhile(predicate, iterable) --> dropwhile object\n\n" +
+        "Drop items from the iterable while predicate(item) is true.\n" +
+        "Afterwards, return every element until the iterable is exhausted.";
 
     /**
      * Create an iterator that drops items from the iterable while <code>predicate(item)</code>
diff --git a/src/org/python/modules/itertools/groupby.java b/src/org/python/modules/itertools/groupby.java
--- a/src/org/python/modules/itertools/groupby.java
+++ b/src/org/python/modules/itertools/groupby.java
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.groupby", base = PyObject.class)
+ at ExposedType(name = "itertools.groupby", base = PyObject.class, doc = groupby.groupby_doc)
 public class groupby extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(groupby.class);
@@ -38,10 +38,9 @@
         groupby___init__(iterable, keyfunc);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String groupby_doc =
         "groupby(iterable[, keyfunc]) -> create an iterator which returns\n" +
-            "(key, sub-iterator) grouped by each value of key(value).");
+        "(key, sub-iterator) grouped by each value of key(value).";
 
     /**
      * Creates an iterator that returns the items of the iterable for which
diff --git a/src/org/python/modules/itertools/ifilter.java b/src/org/python/modules/itertools/ifilter.java
--- a/src/org/python/modules/itertools/ifilter.java
+++ b/src/org/python/modules/itertools/ifilter.java
@@ -12,7 +12,7 @@
 import org.python.expose.ExposedType;
 
 
- at ExposedType(name = "itertools.ifilter", base = PyObject.class)
+ at ExposedType(name = "itertools.ifilter", base = PyObject.class, doc = ifilter.ifilter_doc)
 public class ifilter extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(ifilter.class);
@@ -31,11 +31,10 @@
         ifilter___init__(predicate, iterable);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "ifilter(function or None, sequence) --> ifilter object\n\n"
-                    + "Return those items of sequence for which function(item) is true.\nIf function is None, "
-                    + "return the items that are true.");
+    public static final String ifilter_doc =
+        "ifilter(function or None, sequence) --> ifilter object\n\n" +
+        "Return those items of sequence for which function(item) is true.\n" +
+        "If function is None, return the items that are true.";
 
     /**
      * Creates an iterator that returns the items of the iterable for which
diff --git a/src/org/python/modules/itertools/ifilterfalse.java b/src/org/python/modules/itertools/ifilterfalse.java
--- a/src/org/python/modules/itertools/ifilterfalse.java
+++ b/src/org/python/modules/itertools/ifilterfalse.java
@@ -10,7 +10,8 @@
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.ifilterfalse", base = PyObject.class)
+ at ExposedType(name = "itertools.ifilterfalse", base = PyObject.class,
+    doc = ifilterfalse.ifilterfalse_doc)
 public class ifilterfalse extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(ifilterfalse.class);
@@ -29,11 +30,10 @@
         ifilterfalse___init__(predicate, iterable);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "'ifilterfalse(function or None, sequence) --> ifilterfalse object\n\n"
-                    + "Return those items of sequence for which function(item) is false.\nIf function is None, "
-                    + "return the items that are false.'");
+    public static final String ifilterfalse_doc =
+        "'ifilterfalse(function or None, sequence) --> ifilterfalse object\n\n" +
+        "Return those items of sequence for which function(item) is false.\n" +
+        "If function is None, return the items that are false.'";
 
     /**
      * Creates an iterator that returns the items of the iterable for which
diff --git a/src/org/python/modules/itertools/imap.java b/src/org/python/modules/itertools/imap.java
--- a/src/org/python/modules/itertools/imap.java
+++ b/src/org/python/modules/itertools/imap.java
@@ -12,18 +12,19 @@
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.imap", base = PyObject.class)
+ at ExposedType(name = "itertools.imap", base = PyObject.class, doc = imap.imap_doc)
 public class imap extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(imap.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "'map(func, *iterables) --> imap object\n\nMake an iterator that computes the "
-                    + "function using arguments from\neach of the iterables.\tLike map() except that it returns\n"
-                    + "an iterator instead of a list and that it stops when the shortest\niterable is exhausted "
-                    + "instead of filling in None for shorter\niterables.");
+    public static final String imap_doc =
+        "'map(func, *iterables) --> imap object\n\n" +
+        "Make an iterator that computes the function using arguments from\n" +
+        "each of the iterables.\tLike map() except that it returns\n" +
+        "an iterator instead of a list and that it stops when the shortest\n" +
+        "iterable is exhausted instead of filling in None for shorter\n" +
+        "iterables.";
 
     public imap() {
         super();
diff --git a/src/org/python/modules/itertools/islice.java b/src/org/python/modules/itertools/islice.java
--- a/src/org/python/modules/itertools/islice.java
+++ b/src/org/python/modules/itertools/islice.java
@@ -13,21 +13,20 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.islice", base = PyObject.class)
+ at ExposedType(name = "itertools.islice", base = PyObject.class, doc = islice.islice_doc)
 public class islice extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(islice.class);
     private itertools.ItertoolsIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String islice_doc =
         "islice(iterable, [start,] stop [, step]) --> islice object\n\n" +
         "Return an iterator whose next() method returns selected values from an\n" +
         "iterable.  If start is specified, will skip all preceding elements;\n" +
         "otherwise, start defaults to zero.  Step defaults to one.  If\n" +
         "specified as another value, step determines how many values are \n" +
         "skipped between successive calls.  Works like a slice() on a list\n" +
-        "but returns an iterator.");
+        "but returns an iterator.";
 
     public islice() {
         super();
diff --git a/src/org/python/modules/itertools/itertools.java b/src/org/python/modules/itertools/itertools.java
--- a/src/org/python/modules/itertools/itertools.java
+++ b/src/org/python/modules/itertools/itertools.java
@@ -18,7 +18,7 @@
  */
 public class itertools implements ClassDictInit {
 
-    public static PyString __doc__ = new PyString(
+    public static final PyString __doc__ = new PyString(
             "Functional tools for creating and using iterators.\n\nInfinite iterators:\n"
 	        + "count([n]) --> n, n+1, n+2, ...\n"
 	        + "cycle(p) --> p0, p1, ... plast, p0, p1, ...\n"
diff --git a/src/org/python/modules/itertools/izip.java b/src/org/python/modules/itertools/izip.java
--- a/src/org/python/modules/itertools/izip.java
+++ b/src/org/python/modules/itertools/izip.java
@@ -13,19 +13,20 @@
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.izip", base = PyObject.class)
+ at ExposedType(name = "itertools.izip", base = PyObject.class, doc = izip.izip_doc)
 public class izip extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(izip.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-            "izip(iter1 [,iter2 [...]]) --> izip object\n\nReturn an izip object "
-                    + "whose .next() method returns a tuple where\nthe i-th element comes from the i-th iterable argument.  "
-                    + "The .next()\nmethod continues until the shortest iterable in the argument sequence\nis exhausted and then it "
-                    + "raises StopIteration.  Works like the zip()\nfunction but consumes less memory by returning an iterator "
-                    + "instead of\na list.");
+    public static final String izip_doc =
+        "izip(iter1 [,iter2 [...]]) --> izip object\n\n" +
+        "Return an izip object whose .next() method returns a tuple where\n" +
+        "the i-th element comes from the i-th iterable argument.  The .next()\n" +
+        "method continues until the shortest iterable in the argument sequence\n" +
+        "is exhausted and then it raises StopIteration.  Works like the zip()\n" +
+        "function but consumes less memory by returning an iterator instead of\n" +
+        "a list.";
 
     public izip() {
         super();
diff --git a/src/org/python/modules/itertools/izipLongest.java b/src/org/python/modules/itertools/izipLongest.java
--- a/src/org/python/modules/itertools/izipLongest.java
+++ b/src/org/python/modules/itertools/izipLongest.java
@@ -12,7 +12,8 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.izip_longest", base = PyObject.class)
+ at ExposedType(name = "itertools.izip_longest", base = PyObject.class,
+    doc = izipLongest.izip_longest_doc)
 public class izipLongest extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(izipLongest.class);
@@ -31,15 +32,14 @@
         izipLongest___init__(iterables, fillvalue);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String izip_longest_doc =
         "izip_longest(iter1 [,iter2 [...]], [fillvalue=None]) --> izip_longest object\n\n" +
-            "Return an izip_longest object whose .next() method returns a tuple where\n" +
-            "the i-th element comes from the i-th iterable argument.  The .next()\n" +
-            "method continues until the longest iterable in the argument sequence\n" +
-            "is exhausted and then it raises StopIteration.  When the shorter iterables\n" +
-            "are exhausted, the fillvalue is substituted in their place.  The fillvalue\n" +
-            "defaults to None or can be specified by a keyword argument.");
+        "Return an izip_longest object whose .next() method returns a tuple where\n" +
+        "the i-th element comes from the i-th iterable argument.  The .next()\n" +
+        "method continues until the longest iterable in the argument sequence\n" +
+        "is exhausted and then it raises StopIteration.  When the shorter iterables\n" +
+        "are exhausted, the fillvalue is substituted in their place.  The fillvalue\n" +
+        "defaults to None or can be specified by a keyword argument.";
 
     /**
      * Create an iterator that returns items from the iterable while <code>predicate(item)</code>
diff --git a/src/org/python/modules/itertools/permutations.java b/src/org/python/modules/itertools/permutations.java
--- a/src/org/python/modules/itertools/permutations.java
+++ b/src/org/python/modules/itertools/permutations.java
@@ -13,16 +13,15 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.permutations", base = PyObject.class)
+ at ExposedType(name = "itertools.permutations", base = PyObject.class, doc = permutations.permutations_doc)
 public class permutations extends PyIterator {
     public static final PyType TYPE = PyType.fromClass(permutations.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String permutations_doc =
         "permutations(iterable[, r]) --> permutations object\n\n" +
-            "Return successive r-length permutations of elements in the iterable.\n\n" +
-            "permutations(range(3), 2) --> (0,1), (0,2), (1,0), (1,2), (2,0), (2,1)");
+        "Return successive r-length permutations of elements in the iterable.\n\n" +
+        "permutations(range(3), 2) --> (0,1), (0,2), (1,0), (1,2), (2,0), (2,1)";
 
     public permutations() {
         super();
diff --git a/src/org/python/modules/itertools/product.java b/src/org/python/modules/itertools/product.java
--- a/src/org/python/modules/itertools/product.java
+++ b/src/org/python/modules/itertools/product.java
@@ -12,25 +12,24 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.product", base = PyObject.class)
+ at ExposedType(name = "itertools.product", base = PyObject.class, doc = product.product_doc)
 public class product extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(product.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
+    public static final String product_doc =
         "product(*iterables) --> product object\n\n" +
-            "Cartesian product of input iterables.  Equivalent to nested for-loops.\n\n" +
-            "For example, product(A, B) returns the same as:  ((x,y) for x in A for y in B).\n" +
-            "The leftmost iterators are in the outermost for-loop, so the output tuples\n" +
-            "cycle in a manner similar to an odometer (with the rightmost element changing\n" +
-            "on every iteration).\n\n" +
-            "To compute the product of an iterable with itself, specify the number\n" +
-            "of repetitions with the optional repeat keyword argument. For example,\n" +
-            "product(A, repeat=4) means the same as product(A, A, A, A).\n\n" +
-            "product('ab', range(3)) --> ('a',0) ('a',1) ('a',2) ('b',0) ('b',1) ('b',2)\n" +
-            "product((0,1), (0,1), (0,1)) --> (0,0,0) (0,0,1) (0,1,0) (0,1,1) (1,0,0) ...");
+        "Cartesian product of input iterables.  Equivalent to nested for-loops.\n\n" +
+        "For example, product(A, B) returns the same as:  ((x,y) for x in A for y in B).\n" +
+        "The leftmost iterators are in the outermost for-loop, so the output tuples\n" +
+        "cycle in a manner similar to an odometer (with the rightmost element changing\n" +
+        "on every iteration).\n\n" +
+        "To compute the product of an iterable with itself, specify the number\n" +
+        "of repetitions with the optional repeat keyword argument. For example,\n" +
+        "product(A, repeat=4) means the same as product(A, A, A, A).\n\n" +
+        "product('ab', range(3)) --> ('a',0) ('a',1) ('a',2) ('b',0) ('b',1) ('b',2)\n" +
+        "product((0,1), (0,1), (0,1)) --> (0,0,0) (0,0,1) (0,1,0) (0,1,1) (1,0,0) ...";
 
     public product() {
         super();
diff --git a/src/org/python/modules/itertools/repeat.java b/src/org/python/modules/itertools/repeat.java
--- a/src/org/python/modules/itertools/repeat.java
+++ b/src/org/python/modules/itertools/repeat.java
@@ -13,7 +13,7 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.repeat", base = PyObject.class)
+ at ExposedType(name = "itertools.repeat", base = PyObject.class, doc = repeat.repeat_doc)
 public class repeat extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(repeat.class);
@@ -21,10 +21,10 @@
     private PyObject object;
     private int counter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-        "'repeat(element [,times]) -> create an iterator which returns the element\n"
-            + "for the specified number of times.  If not specified, returns the element\nendlessly.");
+    public static final String repeat_doc =
+        "'repeat(element [,times]) -> create an iterator which returns the element\n" +
+        "for the specified number of times.  If not specified, returns the element\n" +
+        "endlessly.";
 
     public repeat() {
         super();
diff --git a/src/org/python/modules/itertools/starmap.java b/src/org/python/modules/itertools/starmap.java
--- a/src/org/python/modules/itertools/starmap.java
+++ b/src/org/python/modules/itertools/starmap.java
@@ -12,17 +12,16 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.starmap", base = PyObject.class)
+ at ExposedType(name = "itertools.starmap", base = PyObject.class, doc = starmap.starmap_doc)
 public class starmap extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(starmap.class);
     private PyIterator iter;
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-        "starmap(function, sequence) --> starmap object\n\nReturn an "
-            + "iterator whose values are returned from the function evaluated\nwith an argument tuple taken from the "
-            + "given sequence.");
+    public static final String starmap_doc =
+        "starmap(function, sequence) --> starmap object\n\n" +
+        "Return an iterator whose values are returned from the function evaluated\n" +
+        "with an argument tuple taken from the given sequence.";
 
     public starmap() {
         super();
diff --git a/src/org/python/modules/itertools/takewhile.java b/src/org/python/modules/itertools/takewhile.java
--- a/src/org/python/modules/itertools/takewhile.java
+++ b/src/org/python/modules/itertools/takewhile.java
@@ -11,7 +11,7 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "itertools.takewhile", base = PyObject.class)
+ at ExposedType(name = "itertools.takewhile", base = PyObject.class, doc = takewhile.takewhile_doc)
 public class takewhile extends PyIterator {
 
     public static final PyType TYPE = PyType.fromClass(takewhile.class);
@@ -30,11 +30,10 @@
         takewhile___init__(predicate, iterable);
     }
 
-    @ExposedGet
-    public static PyString __doc__ = new PyString(
-        "takewhile(predicate, iterable) --> takewhile object\n\n"
-            + "Return successive entries from an iterable as long as the \n"
-            + "predicate evaluates to true for each entry.");
+    public static final String takewhile_doc =
+        "takewhile(predicate, iterable) --> takewhile object\n\n" +
+        "Return successive entries from an iterable as long as the \n" +
+        "predicate evaluates to true for each entry.";
 
     /**
      * Create an iterator that returns items from the iterable while <code>predicate(item)</code>

-- 
Repository URL: https://hg.python.org/jython


More information about the Jython-checkins mailing list