From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 13 Apr 2010 11:43:10 +0000 (+0000)
Subject: Merged revisions 80035 via svnmerge from
X-Git-Tag: v3.2a1~1155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a09543c65c08363b8d7238cef8c08feb3cd2895b;p=python

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 a33400ed97..422fd879a9 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"""