str, dict, and tuple!

dabrahams · dabrahams · commit 5cfc0cce1470 · 2002-07-18T15:52:18.000Z
[SVN r14519]
diff --git a/Jamfile b/Jamfile
@@ -29,7 +29,6 @@ dll bpl
   src/object/life_support.cpp
   src/errors.cpp
   src/module.cpp
-  src/objects2.cpp
   src/converter/builtin_converters.cpp
   src/converter/arg_to_python_base.cpp
   src/object/iterator.cpp
diff --git a/include/boost/python/str.hpp b/include/boost/python/str.hpp
@@ -40,49 +40,49 @@ class str : public object
     BOOST_PYTHON_DECL long count(object_cref sub, object_cref start) const;
     
     template<class T1, class T2>
-    str count(T1 const& sub,T2 const& start) const
+    long count(T1 const& sub,T2 const& start) const
     {
         return this->count(object(sub), object(start));
     }
 
     BOOST_PYTHON_DECL long count(object_cref sub, object_cref start, object_cref end) const;
 
     template<class T1, class T2, class T3>
-    str count(T1 const& sub,T2 const& start, T3 const& end) const
+    long count(T1 const& sub,T2 const& start, T3 const& end) const
     {
         return this->count(object(sub), object(start));
     }
 
-    BOOST_PYTHON_DECL str decode() const;
-    BOOST_PYTHON_DECL str decode(object_cref encoding) const;
+    BOOST_PYTHON_DECL object decode() const;
+    BOOST_PYTHON_DECL object decode(object_cref encoding) const;
 
     template<class T>
-    str decode(T const& encoding) const
+    object decode(T const& encoding) const
     {
         return this->decode(object(encoding));
     }
 
-    BOOST_PYTHON_DECL str decode(object_cref encoding, object_cref errors) const;
+    BOOST_PYTHON_DECL object decode(object_cref encoding, object_cref errors) const;
 
     template<class T1, class T2>
-    str decode(T1 const& encoding, T2 const& errors) const
+    object decode(T1 const& encoding, T2 const& errors) const
     {
         return this->decode(object(encoding),object(errors));
     }
 
-    BOOST_PYTHON_DECL str encode() const;
-    BOOST_PYTHON_DECL str encode(object_cref encoding) const;
+    BOOST_PYTHON_DECL object encode() const;
+    BOOST_PYTHON_DECL object encode(object_cref encoding) const;
 
     template <class T>
-    str encode(T const& encoding) const
+    object encode(T const& encoding) const
     {
         return this->encode(object(encoding));
     }
 
-    BOOST_PYTHON_DECL str encode(object_cref encoding, object_cref errors) const;
+    BOOST_PYTHON_DECL object encode(object_cref encoding, object_cref errors) const;
 
     template <class T1, class T2>
-    str encode(T1 const& encoding, T2 const& errors) const
+    object encode(T1 const& encoding, T2 const& errors) const
     {
         return this->encode(object(encoding),object(errors));
     }
diff --git a/src/str.cpp b/src/str.cpp
@@ -59,34 +59,34 @@ BOOST_PYTHON_DECL long str::count(object_cref sub, object_cref start, object_cre
     return extract<long>(this->attr("count")(sub,start,end));
 }
 
-BOOST_PYTHON_DECL str str::decode() const
+BOOST_PYTHON_DECL object str::decode() const
 {
-    return assume_str(this->attr("decode")());
+    return this->attr("decode")();
 }
 
-BOOST_PYTHON_DECL str str::decode(object_cref encoding) const
+BOOST_PYTHON_DECL object str::decode(object_cref encoding) const
 {
-    return assume_str(this->attr("decode")(encoding));
+    return this->attr("decode")(encoding);
 }
 
-BOOST_PYTHON_DECL str str::decode(object_cref encoding, object_cref errors) const
+BOOST_PYTHON_DECL object str::decode(object_cref encoding, object_cref errors) const
 {
-    return assume_str(this->attr("decode")(encoding,errors));
+    return this->attr("decode")(encoding,errors);
 }
 
-BOOST_PYTHON_DECL str str::encode() const
+BOOST_PYTHON_DECL object str::encode() const
 {
-    return assume_str(this->attr("encode")());
+    return this->attr("encode")();
 }
 
-BOOST_PYTHON_DECL str str::encode(object_cref encoding) const
+BOOST_PYTHON_DECL object str::encode(object_cref encoding) const
 {
-    return assume_str(this->attr("encode")(encoding));
+    return this->attr("encode")(encoding);
 }
 
-BOOST_PYTHON_DECL str str::encode(object_cref encoding, object_cref errors) const
+BOOST_PYTHON_DECL object str::encode(object_cref encoding, object_cref errors) const
 {
-    return assume_str(this->attr("encode")(encoding,errors));
+    return this->attr("encode")(encoding,errors);
 }
 
 BOOST_PYTHON_DECL bool str::endswith(object_cref suffix) const

Original file line number	Diff line number	Diff line change
`@@ -40,49 +40,49 @@ class str : public object`
`40`	`40`	`BOOST_PYTHON_DECL long count(object_cref sub, object_cref start) const;`
`41`	`41`
`42`	`42`	`template<class T1, class T2>`
`43`		`- str count(T1 const& sub,T2 const& start) const`
	`43`	`+ long count(T1 const& sub,T2 const& start) const`
`44`	`44`	`{`
`45`	`45`	`return this->count(object(sub), object(start));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`BOOST_PYTHON_DECL long count(object_cref sub, object_cref start, object_cref end) const;`
`49`	`49`
`50`	`50`	`template<class T1, class T2, class T3>`
`51`		`- str count(T1 const& sub,T2 const& start, T3 const& end) const`
	`51`	`+ long count(T1 const& sub,T2 const& start, T3 const& end) const`
`52`	`52`	`{`
`53`	`53`	`return this->count(object(sub), object(start));`
`54`	`54`	`}`
`55`	`55`
`56`		`- BOOST_PYTHON_DECL str decode() const;`
`57`		`- BOOST_PYTHON_DECL str decode(object_cref encoding) const;`
	`56`	`+ BOOST_PYTHON_DECL object decode() const;`
	`57`	`+ BOOST_PYTHON_DECL object decode(object_cref encoding) const;`
`58`	`58`
`59`	`59`	`template<class T>`
`60`		`- str decode(T const& encoding) const`
	`60`	`+ object decode(T const& encoding) const`
`61`	`61`	`{`
`62`	`62`	`return this->decode(object(encoding));`
`63`	`63`	`}`
`64`	`64`
`65`		`- BOOST_PYTHON_DECL str decode(object_cref encoding, object_cref errors) const;`
	`65`	`+ BOOST_PYTHON_DECL object decode(object_cref encoding, object_cref errors) const;`
`66`	`66`
`67`	`67`	`template<class T1, class T2>`
`68`		`- str decode(T1 const& encoding, T2 const& errors) const`
	`68`	`+ object decode(T1 const& encoding, T2 const& errors) const`
`69`	`69`	`{`
`70`	`70`	`return this->decode(object(encoding),object(errors));`
`71`	`71`	`}`
`72`	`72`
`73`		`- BOOST_PYTHON_DECL str encode() const;`
`74`		`- BOOST_PYTHON_DECL str encode(object_cref encoding) const;`
	`73`	`+ BOOST_PYTHON_DECL object encode() const;`
	`74`	`+ BOOST_PYTHON_DECL object encode(object_cref encoding) const;`
`75`	`75`
`76`	`76`	`template <class T>`
`77`		`- str encode(T const& encoding) const`
	`77`	`+ object encode(T const& encoding) const`
`78`	`78`	`{`
`79`	`79`	`return this->encode(object(encoding));`
`80`	`80`	`}`
`81`	`81`
`82`		`- BOOST_PYTHON_DECL str encode(object_cref encoding, object_cref errors) const;`
	`82`	`+ BOOST_PYTHON_DECL object encode(object_cref encoding, object_cref errors) const;`
`83`	`83`
`84`	`84`	`template <class T1, class T2>`
`85`		`- str encode(T1 const& encoding, T2 const& errors) const`
	`85`	`+ object encode(T1 const& encoding, T2 const& errors) const`
`86`	`86`	`{`
`87`	`87`	`return this->encode(object(encoding),object(errors));`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,34 +59,34 @@ BOOST_PYTHON_DECL long str::count(object_cref sub, object_cref start, object_cre`
`59`	`59`	`return extract<long>(this->attr("count")(sub,start,end));`
`60`	`60`	`}`
`61`	`61`
`62`		`-BOOST_PYTHON_DECL str str::decode() const`
	`62`	`+BOOST_PYTHON_DECL object str::decode() const`
`63`	`63`	`{`
`64`		`- return assume_str(this->attr("decode")());`
	`64`	`+ return this->attr("decode")();`
`65`	`65`	`}`
`66`	`66`
`67`		`-BOOST_PYTHON_DECL str str::decode(object_cref encoding) const`
	`67`	`+BOOST_PYTHON_DECL object str::decode(object_cref encoding) const`
`68`	`68`	`{`
`69`		`- return assume_str(this->attr("decode")(encoding));`
	`69`	`+ return this->attr("decode")(encoding);`
`70`	`70`	`}`
`71`	`71`
`72`		`-BOOST_PYTHON_DECL str str::decode(object_cref encoding, object_cref errors) const`
	`72`	`+BOOST_PYTHON_DECL object str::decode(object_cref encoding, object_cref errors) const`
`73`	`73`	`{`
`74`		`- return assume_str(this->attr("decode")(encoding,errors));`
	`74`	`+ return this->attr("decode")(encoding,errors);`
`75`	`75`	`}`
`76`	`76`
`77`		`-BOOST_PYTHON_DECL str str::encode() const`
	`77`	`+BOOST_PYTHON_DECL object str::encode() const`
`78`	`78`	`{`
`79`		`- return assume_str(this->attr("encode")());`
	`79`	`+ return this->attr("encode")();`
`80`	`80`	`}`
`81`	`81`
`82`		`-BOOST_PYTHON_DECL str str::encode(object_cref encoding) const`
	`82`	`+BOOST_PYTHON_DECL object str::encode(object_cref encoding) const`
`83`	`83`	`{`
`84`		`- return assume_str(this->attr("encode")(encoding));`
	`84`	`+ return this->attr("encode")(encoding);`
`85`	`85`	`}`
`86`	`86`
`87`		`-BOOST_PYTHON_DECL str str::encode(object_cref encoding, object_cref errors) const`
	`87`	`+BOOST_PYTHON_DECL object str::encode(object_cref encoding, object_cref errors) const`
`88`	`88`	`{`
`89`		`- return assume_str(this->attr("encode")(encoding,errors));`
	`89`	`+ return this->attr("encode")(encoding,errors);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`BOOST_PYTHON_DECL bool str::endswith(object_cref suffix) const`