From f77d7ab2a6c4387792b145caa354aab54243701f Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Wed, 30 Nov 2005 07:36:01 +0000 Subject: fix recurring typo: occured --> occurred (already fixed in Python trunk) --- Lib/pydoc.py | 2 +- Lib/test/test_dircache.py | 2 +- Lib/test/test_threadsignals.py | 2 +- Lib/trace.py | 2 +- Mac/Tools/IDE/Wsocket.py | 2 +- Tools/msi/uisample.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index d370b06..ceabb14 100755 --- 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 3f10872..68f6fc2 100644 --- 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 fcae312..51e3d97 100644 --- 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 f167fcf..799c302 100644 --- 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 eb5936d..82f4df5 100644 --- 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 d66c3cd..b052ab0 100644 --- 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'] -- cgit v0.12