Permalink
Browse files

Removing reference to depricated 'sets' module.

  • Loading branch information...
1 parent 1e834b0 commit 89b643981bd10d77d4cd5a661095f5a038c7ef06 @wolever committed Aug 30, 2011
Showing with 6 additions and 8 deletions.
  1. +1 −2 PI/input.py
  2. +2 −3 PI/phylogeny.py
  3. +1 −1 README
  4. +2 −2 main.py
View
@@ -12,7 +12,6 @@
from pcapy import *
from socket import *
-from sets import *
__all__ = ["Input", "Pcap", "ASCII" ]
@@ -23,7 +22,7 @@ class Input:
def __init__(self, filename):
"""Import specified filename"""
- self.set = Set()
+ self.set = set()
self.sequences = []
self.index = 0
View
@@ -15,7 +15,6 @@
Licensed under the LGPL
"""
-from sets import *
from tree import *
from pydot import *
@@ -61,8 +60,8 @@ class UPGMA(Phylogeny):
def _go(self):
- # Universal set
- Cu = Set()
+ # Universal Set
+ Cu = set()
# Place each sequence into individual tree node
for i in range(len(self.sequences)):
View
2 README
@@ -16,7 +16,7 @@ component set.
Requirements:
-Python >= 2.3.4 http://www.python.org
+Python >= 2.4 http://www.python.org
numpy http://numpy.scipy.org/
Pyrex http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/
Pcapy http://oss.coresecurity.com/projects/pcapy.html
View
@@ -62,13 +62,13 @@ def main():
if format == "pcap":
try:
sequences = input.Pcap(file)
- except:
+ except IOError:
print "FATAL: Error opening '%s'" % file
sys.exit(-1)
elif format == "ascii":
try:
sequences = input.ASCII(file)
- except:
+ except IOError:
print "FATAL: Error opening '%s'" % file
sys.exit(-1)
else:

0 comments on commit 89b6439

Please sign in to comment.