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.
  ........
................

diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py
index a33400ed97530a0e9c72d320e45716f77655d13a..422fd879a913a4f840467e0596601e5558444fca 100644 (file)
--- 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"""