summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason2012-07-21 05:42:55 -0600
committerjason2012-07-21 05:42:55 -0600
commitbae3f618f358796896914e8159d7e6677d01a3b0 (patch)
tree6409575ffe82d24561dd10b137f285b0cd67fb89
parentf28ee04f142db3192027ca99ea5d86705ce14d7f (diff)
downloadwarmachine-bae3f618f358796896914e8159d7e6677d01a3b0.tar.gz
warmachine-bae3f618f358796896914e8159d7e6677d01a3b0.zip
Renamed warmachine.py
-rwxr-xr-xwarmachine10
-rw-r--r--[-rwxr-xr-x]wmd/irc.py (renamed from warmachine.py)17
2 files changed, 10 insertions, 17 deletions
diff --git a/warmachine b/warmachine
new file mode 100755
index 0000000..d44f0c1
--- /dev/null
+++ b/warmachine
@@ -0,0 +1,10 @@
1#!/usr/bin/env python
2from wmd.irc import IRC
3import settings
4
5if __name__ == '__main__':
6 i = IRC(settings.SERVER, settings.NICKNAME, settings.IDENT, settings.PORT)
7 i.connect()
8 for channel in settings.CHANNELS:
9 i.join(channel)
10 i()
diff --git a/warmachine.py b/wmd/irc.py
index a8cac68..aa90b8b 100755..100644
--- a/warmachine.py
+++ b/wmd/irc.py
@@ -1,12 +1,3 @@
1#!/usr/bin/env python
2
3import socket
4import sys
5from actions.ActionMap import *
6from passiveactions.PassiveActionMap import *
7from conf.users import *
8from wmd import parser
9
10class IRC(object): 1class IRC(object):
11 2
12 def __init__(self, server=None, nick=None, name=None, port=6667): 3 def __init__(self, server=None, nick=None, name=None, port=6667):
@@ -90,11 +81,3 @@ class IRC(object):
90 except Exception,e: 81 except Exception,e:
91 print "Action failed" 82 print "Action failed"
92 print e 83 print e
93
94if __name__ == '__main__':
95 import settings
96 i = IRC(settings.SERVER, settings.NICKNAME, settings.IDENT, settings.PORT)
97 i.connect()
98 for channel in settings.CHANNELS:
99 i.join(channel)
100 i()