From 04de40e6d7e70003a695e67d6434a8e1d0429c64 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Tue, 13 Apr 2010 11:53:16 +0000 Subject: [PATCH] Merged revisions 80036 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80036 | mark.dickinson | 2010-04-13 12:43:10 +0100 (Tue, 13 Apr 2010) | 9 lines Merged revisions 80035 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80035 | mark.dickinson | 2010-04-13 12:37:23 +0100 (Tue, 13 Apr 2010) | 1 line In test_winsound, don't try to import _winreg until after checking that winsound is supported. ........ ................ --- Lib/test/test_winsound.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index a33400ed975..422fd879a91 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -6,9 +6,9 @@ support.requires('audio') import time import os import subprocess -import winreg winsound = support.import_module('winsound') +import winreg def has_sound(sound): """Find out if a particular event is configured with a default sound"""