[pypy-svn] r40053 - in pypy/branch/rope-branch2/pypy: config objspace/std/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Wed Mar  7 22:13:39 2007
New Revision: 40053

Modified:
   pypy/branch/rope-branch2/pypy/config/pypyoption.py
   pypy/branch/rope-branch2/pypy/objspace/std/test/test_ropeobject.py
Log:
suggest the prebuilt string options when using ropes, since they have an even
heavier allocation penalty


Modified: pypy/branch/rope-branch2/pypy/config/pypyoption.py
==============================================================================
--- pypy/branch/rope-branch2/pypy/config/pypyoption.py	(original)
+++ pypy/branch/rope-branch2/pypy/config/pypyoption.py	Wed Mar  7 22:13:39 2007
@@ -130,14 +130,16 @@
         BoolOption("withprebuiltchar",
                    "use prebuilt single-character string objects"),
 
-        BoolOption("withrope", "use ropes as the string implementation",
-                   default=False),
-
         BoolOption("sharesmallstr",
                    "always reuse the prebuilt string objects "
                    "(the empty string and potentially single-char strings)",
                    default=False),
 
+        BoolOption("withrope", "use ropes as the string implementation",
+                   default=False,
+                   suggests=[("objspace.std.withprebuiltchar", True),
+                             ("objspace.std.sharesmallstr", True)]),
+
         BoolOption("withmultidict",
                    "use dictionaries optimized for flexibility",
                    default=False),

Modified: pypy/branch/rope-branch2/pypy/objspace/std/test/test_ropeobject.py
==============================================================================
--- pypy/branch/rope-branch2/pypy/objspace/std/test/test_ropeobject.py	(original)
+++ pypy/branch/rope-branch2/pypy/objspace/std/test/test_ropeobject.py	Wed Mar  7 22:13:39 2007
@@ -73,30 +73,30 @@
     def setup_class(cls):
         cls.space = gettestobjspace(**{"objspace.std.withrope": True})
 
-class AppTestPrebuilt(test_stringobject.AppTestStringObject):
+class AppTestPrebuilt(AppTestRopeObject):
     def setup_class(cls):
         cls.space = gettestobjspace(**{"objspace.std.withrope": True,
-                                       "objspace.std.withprebuiltchar": True})
+                                       "objspace.std.withprebuiltchar": False})
 
     def test_hash(self):
         # does not make sense, since our hash is different than CPython's
         pass
  
 
-class AppTestShare(test_stringobject.AppTestStringObject):
+class AppTestShare(AppTestRopeObject):
     def setup_class(cls):
         cls.space = gettestobjspace(**{"objspace.std.withrope": True,
-                                       "objspace.std.sharesmallstr": True})
+                                       "objspace.std.sharesmallstr": False})
 
     def test_hash(self):
         # does not make sense, since our hash is different than CPython's
         pass
  
-class AppTestPrebuiltShare(test_stringobject.AppTestStringObject):
+class AppTestPrebuiltShare(AppTestRopeObject):
     def setup_class(cls):
         cls.space = gettestobjspace(**{"objspace.std.withrope": True,
-                                       "objspace.std.withprebuiltchar": True,
-                                       "objspace.std.sharesmallstr": True})
+                                       "objspace.std.withprebuiltchar": False,
+                                       "objspace.std.sharesmallstr": False})
 
     def test_hash(self):
         # does not make sense, since our hash is different than CPython's