[Python-checkins] r66100 - python/trunk/Lib/msilib/__init__.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Mon Sep  1 16:24:04 2008
New Revision: 66100

Log:
Issue #3732: Backported r53335 to supress deprecation warning.
Reviewed by Benjamin Peterson.


Modified:
   python/trunk/Lib/msilib/__init__.py

Modified: python/trunk/Lib/msilib/__init__.py
==============================================================================
--- python/trunk/Lib/msilib/__init__.py	(original)
+++ python/trunk/Lib/msilib/__init__.py	Mon Sep  1 16:24:04 2008
@@ -2,7 +2,7 @@
 # Copyright (C) 2005 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 from _msi import *
-import sets, os, string, re
+import os, string, re
 
 Win64=0
 
@@ -184,7 +184,7 @@
     def __init__(self, name):
         self.name = name
         self.files = []
-        self.filenames = sets.Set()
+        self.filenames = set()
         self.index = 0
 
     def gen_id(self, file):
@@ -215,7 +215,7 @@
         os.unlink(filename)
         db.Commit()
 
-_directories = sets.Set()
+_directories = set()
 class Directory:
     def __init__(self, db, cab, basedir, physical, _logical, default, componentflags=None):
         """Create a new directory in the Directory table. There is a current component
@@ -239,8 +239,8 @@
         self.physical = physical
         self.logical = logical
         self.component = None
-        self.short_names = sets.Set()
-        self.ids = sets.Set()
+        self.short_names = set()
+        self.ids = set()
         self.keyfiles = {}
         self.componentflags = componentflags
         if basedir: