Update of /cvsroot/pybot/pybot/pybot/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv16526/pybot/modules
Modified Files:
options.py permission.py servercontrol.py
Log Message:
- modules/userdata.py,modules/permission.py: A much better userdata
registry and permission system was developed.
- misc.py: Increased maximum line size to 400 characters.
- server.py,runner.py,modules/permission.py: Implemented a
pybot console, allowing one to talk to pybot locally.
- scripts/*: Removed setup scripts. They're not needed anymore
now that we have a console.
- core.py: Removed (why was it still here?).
- modules/options.py: Get filename from configuration file.
Index: options.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/options.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.py 4 Dec 2001 00:57:38 -0000 1.2
--- options.py 9 May 2003 20:18:36 -0000 1.3
***************
*** 28,31 ****
--- 28,32 ----
hooks.register("Reboot", self.write, 1000)
hooks.register("Quit", self.write, 1000)
+ self.path = config.get("options", "path")
self.read()
self.safe_env = {"__builtins__": {}, "None": None}
***************
*** 38,48 ****
def write(self):
! file = open("options", "w")
cPickle.dump(options.getharddict(), file, 1)
file.close()
def read(self):
! if os.path.exists("options"):
! file = open("options")
newoption = cPickle.load(file)
oldoption = options.getharddict()
--- 39,49 ----
def write(self):
! file = open(self.path, "w")
cPickle.dump(options.getharddict(), file, 1)
file.close()
def read(self):
! if os.path.exists(self.path):
! file = open(self.path)
newoption = cPickle.load(file)
oldoption = options.getharddict()
Index: permission.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/permission.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** permission.py 9 May 2003 15:27:44 -0000 1.6
--- permission.py 9 May 2003 20:18:36 -0000 1.7
***************
*** 162,165 ****
--- 162,167 ----
def mm_hasperm(self, defret, servername, channel, user, perm):
+ if servername == "console":
+ return 1
if (servername, mm.loggednick(0, servername, user)) in \
self.staticadmins:
Index: servercontrol.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/servercontrol.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** servercontrol.py 2 Nov 2001 17:20:22 -0000 1.1.1.1
--- servercontrol.py 9 May 2003 20:18:36 -0000 1.2
***************
*** 146,150 ****
else:
msg.answer("%:", ["I'm connecting, sir!", "I'm going there!", "At your order, sir!", "No problems!", "Right now!", "Ok!"])
! self.servers[var[0]] = ["pybot", "pybot", "0", "PyBot", []]
servers.add(var[0])
else:
--- 146,150 ----
else:
msg.answer("%:", ["I'm connecting, sir!", "I'm going there!", "At your order, sir!", "No problems!", "Right now!", "Ok!"])
! self.servers[var[0]] = ["pybot", "pybot", "0", "PyBot", {}]
servers.add(var[0])
else:
|
