fix recurring typo: occured --> occurred

(already fixed in Python trunk)

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index d370b06f37333779e54cfc702aed19ae9ce75304..ceabb14446538df7b82d510cd83e9dad2cad0043 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -264,7 +264,7 @@ def safeimport(path, forceload=0, cache={}):
         # 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.

diff --git a/Lib/test/test_dircache.py b/Lib/test/test_dircache.py
index 3f10872caf52fb89a89c3c0ce55527faf08589a2..68f6fc28b6c49292fa0db2a418efcbc17b070ec2 100644 (file)
--- a/Lib/test/test_dircache.py
+++ b/Lib/test/test_dircache.py
@@ -46,7 +46,7 @@ class DircacheTests(unittest.TestCase):
 
         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")

diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index fcae312480cfd5fb2c6588633e573b159835cdcd..51e3d97f49543ceef2fa1c2fe953aa341627f06a 100644 (file)
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -21,7 +21,7 @@ def registerSignals((for_usr1, for_usr2, for_alrm)):
     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

diff --git a/Lib/trace.py b/Lib/trace.py
index f167fcfad80e29e51a6630ec9ec3b0a816b806e4..799c30280840bf527e9992360bcb02f1b6e415e4 100644 (file)
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -133,7 +133,7 @@ class Ignore:
             # 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

diff --git a/Mac/Tools/IDE/Wsocket.py b/Mac/Tools/IDE/Wsocket.py
index eb5936d41decd94b263ed73b3f6025b357bd642c..82f4df54dfbfc1f2f0a6221a9426991218f2b9d0 100644 (file)
--- a/Mac/Tools/IDE/Wsocket.py
+++ b/Mac/Tools/IDE/Wsocket.py
@@ -163,7 +163,7 @@ class ConnectionUI:
             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):

diff --git a/Tools/msi/uisample.py b/Tools/msi/uisample.py
index d66c3cd63438afdaf903304e4a2c767a90fcdba9..b052ab0bd7d75bc1385383423a82bd0a37fe14bf 100644 (file)
--- a/Tools/msi/uisample.py
+++ b/Tools/msi/uisample.py
@@ -1393,7 +1393,7 @@ Error = [
 (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']