[Checkins] SVN: z3c.widget/trunk/src/z3c/widget/ Fixed test failures.

[Stephan Richter]

Log message for revision 79769:
  Fixed test failures.
  
  Does someone run the tests before checking things in?
  
  

Changed:
  U   z3c.widget/trunk/src/z3c/widget/flashupload/README.txt
  U   z3c.widget/trunk/src/z3c/widget/tiny/widget.py

-=-
Modified: z3c.widget/trunk/src/z3c/widget/flashupload/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/flashupload/README.txt	2007-09-20 19:22:53 UTC (rev 79768)
+++ z3c.widget/trunk/src/z3c/widget/flashupload/README.txt	2007-09-20 20:13:23 UTC (rev 79769)
@@ -3,6 +3,7 @@
 ===================
 
 the flashupload vars page configures the flash frontend
+
     >>> from z3c.widget.flashupload import upload
     >>> from zope.testing.doctestunit import DocTestSuite
     >>> from zope.publisher.browser import TestRequest
@@ -10,7 +11,8 @@
     >>> from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
     >>> request = TestRequest()
     >>> context = object()
-    >>> viewClass = SimpleViewClass('flashuploadvars.pt', bases=(upload.FlashUploadVars,))
+    >>> viewClass = SimpleViewClass(
+    ...     'flashuploadvars.pt', bases=(upload.FlashUploadVars,))
     >>> view = viewClass(context, request)
     >>> print view()
     <?xml version="1.0" ?>
@@ -19,7 +21,12 @@
         <var name="overall_progress">Overall Progress</var>
         <var name="error">Error on uploading files</var>
         <var name="uploadcomplete">all files uploaded</var>
+        <var name="uploadpartial">files uploaded</var>
+        <var name="notuploaded">files were not uploaded because
+           they're too big</var>
+        <var name="maxfilesize">maximum file size is</var>
     </var>
+
     >>> view.allowedFileTypes = ('.jpg', '.gif')
     >>> print view()
     <?xml version="1.0" ?>
@@ -28,4 +35,4 @@
         <var name="allowedFileType">.jpg</var>
         <var name="allowedFileType">.gif</var>
      </var>
-    
+

Modified: z3c.widget/trunk/src/z3c/widget/tiny/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/tiny/widget.py	2007-09-20 19:22:53 UTC (rev 79768)
+++ z3c.widget/trunk/src/z3c/widget/tiny/widget.py	2007-09-20 20:13:23 UTC (rev 79769)
@@ -22,11 +22,11 @@
     haveResourceLibrary = True
 except ImportError:
     haveResourceLibrary = False
-    
+
 from zope.app.form.browser import TextAreaWidget
 
 template = """%(widget_html)s<script type="text/javascript">
-tinyMCE.init({ 
+tinyMCE.init({
 mode : "exact", %(options)s
 elements : "%(name)s"
 }
@@ -44,8 +44,8 @@
 for langFile in glob.glob(
     os.path.join(os.path.dirname(__file__),'tiny_mce','langs') + '/??.js'):
     MCE_LANGS.append(os.path.basename(langFile)[:2])
-                     
 
+
 class TinyWidget(TextAreaWidget):
 
 
@@ -60,13 +60,13 @@
 
     By default, only the needed options to MCE are passed to
     the init method.
-    
+
     >>> widget = TinyWidget(field, request)
     >>> print widget()
     <textarea cols="60" id="field.foo" name="field.foo" rows="15" >Hello
     world!</textarea><script type="text/javascript">
-    tinyMCE.init({ 
-    mode : "exact", 
+    tinyMCE.init({
+    mode : "exact",
     elements : "field.foo"
     }
     );
@@ -85,7 +85,7 @@
     >>> print widget()
     <textarea ...
     tinyMCE.init({
-    mode : "exact", ask : true, theme : "advanced", 
+    mode : "exact", ask : true, theme : "advanced",
     elements : "field.foo"
     }
     );
@@ -93,7 +93,7 @@
 
     Also the string literals "true" and "false" are converted to js
     booleans. This is usefull for widgets created by zcml.
-    
+
     >>> widget = TinyWidget(field, request)
     >>> widget.mce_ask='true'
     >>> print widget()
@@ -105,7 +105,7 @@
     Languages are taken from the tiny_mce/langs directory (currently
     only the ones with an iso name are registered).
 
-    >>> print MCE_LANGS
+    >>> print sorted(MCE_LANGS)
     ['ar', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en', 'es', 'fa', \
     'fi', 'fr', 'he', 'hu', 'is', 'it', 'ja', 'ko', 'nb', 'nl', \
     'nn', 'pl', 'pt', 'ru', 'si', 'sk', 'sv', 'th', 'tr', 'vi']
@@ -117,12 +117,12 @@
     >>> request.locale.id.language='de'
     >>> print widget()
     <textarea ...
-    mode : "exact", ask : true, language : "de", 
+    mode : "exact", ask : true, language : "de",
     ...
     </script>
-    
+
     """
-    
+
     def __call__(self,*args,**kw):
         if haveResourceLibrary:
             resourcelibrary.need('tiny_mce')