summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/FileMonitor.py
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2008-12-22 04:09:48 +0000
committerSol Jerome <solj@ices.utexas.edu>2008-12-22 04:09:48 +0000
commite3fb140c8d44d751766535eedefcc4ada6544bd1 (patch)
tree9cfe7aa923ec2b1f2e17df1ced892508987b9a6f /src/lib/Server/FileMonitor.py
parent5ab6c7a56e1cb16fee6b04a2b74e615f8f4c557e (diff)
downloadbcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.tar.gz
bcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.tar.bz2
bcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.zip
Update dictionary accesses to work with Python 3.0
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4999 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/FileMonitor.py')
-rw-r--r--src/lib/Server/FileMonitor.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/FileMonitor.py b/src/lib/Server/FileMonitor.py
index 73ae8b8a2..0840019e8 100644
--- a/src/lib/Server/FileMonitor.py
+++ b/src/lib/Server/FileMonitor.py
@@ -68,7 +68,7 @@ class FamFam(object):
else:
collapsed += 1
for event in unique:
- if self.users.has_key(event.requestID):
+ if event.requestID in self.users:
try:
self.users[event.requestID].HandleEvent(event)
except:
@@ -95,7 +95,7 @@ class GaminEvent(Event):
Event.__init__(self, request_id, filename, code)
action_map = {GAMCreated: 'created', GAMExists: 'exists', GAMChanged: 'changed',
GAMDeleted: 'deleted', GAMEndExist: 'endExist', GAMMoved: 'moved'}
- if action_map.has_key(code):
+ if code in action_map:
self.action = action_map[code]
class GaminFam(object):
@@ -211,7 +211,7 @@ class PseudoFam(object):
rawevents.append(event)
self.pending = []
for event in rawevents:
- if self.users.has_key(event.requestID):
+ if event.requestID in self.users:
self.users[event.requestID].HandleEvent(event)
return count