[Python-checkins] commit of r41566 - in python/branches/release24-maint: Lib Lib/test Mac/Tools/IDE Tools/msi

[fred.drake]

Author: fred.drake
Date: Wed Nov 30 08:36:01 2005
New Revision: 41566

Modified:
   python/branches/release24-maint/Lib/pydoc.py
   python/branches/release24-maint/Lib/test/test_dircache.py
   python/branches/release24-maint/Lib/test/test_threadsignals.py
   python/branches/release24-maint/Lib/trace.py
   python/branches/release24-maint/Mac/Tools/IDE/Wsocket.py
   python/branches/release24-maint/Tools/msi/uisample.py
Log:
fix recurring typo: occured --> occurred
(already fixed in Python trunk)


Modified: python/branches/release24-maint/Lib/pydoc.py
==============================================================================
--- python/branches/release24-maint/Lib/pydoc.py	(original)
+++ python/branches/release24-maint/Lib/pydoc.py	Wed Nov 30 08:36:01 2005
@@ -264,7 +264,7 @@
         # Did the error occur before or after the module was found?
         (exc, value, tb) = info = sys.exc_info()
         if path in sys.modules:
-            # An error occured while executing the imported module.
+            # An error occurred while executing the imported module.
             raise ErrorDuringImport(sys.modules[path].__file__, info)
         elif exc is SyntaxError:
             # A SyntaxError occurred before we could execute the module.

Modified: python/branches/release24-maint/Lib/test/test_dircache.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_dircache.py	(original)
+++ python/branches/release24-maint/Lib/test/test_dircache.py	Wed Nov 30 08:36:01 2005
@@ -46,7 +46,7 @@
 
         if sys.platform[:3] not in ('win', 'os2'):
             # Sadly, dircache has the same granularity as stat.mtime, and so
-            # can't notice any changes that occured within 1 sec of the last
+            # can't notice any changes that occurred within 1 sec of the last
             # time it examined a directory.
             time.sleep(1)
             self.writeTemp("test1")

Modified: python/branches/release24-maint/Lib/test/test_threadsignals.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_threadsignals.py	(original)
+++ python/branches/release24-maint/Lib/test/test_threadsignals.py	Wed Nov 30 08:36:01 2005
@@ -21,7 +21,7 @@
     return usr1, usr2, alrm
 
 
-# The signal handler. Just note that the signal occured and
+# The signal handler. Just note that the signal occurred and
 # from who.
 def handle_signals(sig,frame):
     signal_blackboard[sig]['tripped'] += 1

Modified: python/branches/release24-maint/Lib/trace.py
==============================================================================
--- python/branches/release24-maint/Lib/trace.py	(original)
+++ python/branches/release24-maint/Lib/trace.py	Wed Nov 30 08:36:01 2005
@@ -133,7 +133,7 @@
             # the ignore list
             n = len(mod)
             # (will not overflow since if the first n characters are the
-            # same and the name has not already occured, then the size
+            # same and the name has not already occurred, then the size
             # of "name" is greater than that of "mod")
             if mod == modulename[:n] and modulename[n] == '.':
                 self._ignore[modulename] = 1

Modified: python/branches/release24-maint/Mac/Tools/IDE/Wsocket.py
==============================================================================
--- python/branches/release24-maint/Mac/Tools/IDE/Wsocket.py	(original)
+++ python/branches/release24-maint/Mac/Tools/IDE/Wsocket.py	Wed Nov 30 08:36:01 2005
@@ -163,7 +163,7 @@
             def settotal(int total): gets called when the connection knows the data size
             def setcurrent(int current): gets called when some new data has arrived
             def done(): gets called when the transaction is complete
-            def error(type, value, tb): gets called wheneven an error occured
+            def error(type, value, tb): gets called wheneven an error occurred
     """
 
     def __init__(self, settotal_func, setcurrent_func, done_func, error_func):

Modified: python/branches/release24-maint/Tools/msi/uisample.py
==============================================================================
--- python/branches/release24-maint/Tools/msi/uisample.py	(original)
+++ python/branches/release24-maint/Tools/msi/uisample.py	Wed Nov 30 08:36:01 2005
@@ -1393,7 +1393,7 @@
 (1932, u'The Windows Installer service cannot update the protected Windows file [2]. {{Package version: [3], OS Protected version: [4], SFP Error: [5]}}'),
 (1933, u'The Windows Installer service cannot update one or more protected Windows files. {{SFP Error: [2].  List of protected files:\\r\\n[3]}}'),
 (1934, u'User installations are disabled via policy on the machine.'),
-(1935, u'An error occured during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}}'),
+(1935, u'An error occurred during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}}'),
 ]
 
 tables=['AdminExecuteSequence', 'AdminUISequence', 'AdvtExecuteSequence', 'BBControl', 'Billboard', 'Binary', 'CheckBox', 'Property', 'ComboBox', 'Control', 'ListBox', 'ActionText', 'ControlCondition', 'ControlEvent', 'Dialog', 'EventMapping', 'InstallExecuteSequence', 'InstallUISequence', 'ListView', 'RadioButton', 'TextStyle', 'UIText', '_Validation', 'Error']