diff --git a/ansi.py b/ansi.py index b7fdfaf..36191c5 100644 --- a/ansi.py +++ b/ansi.py @@ -1,13 +1,5 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20091215224421.2:@thin ansi.py import config if config.USE_CYTHON: from ansi_cython import * else: from ansi_python import * - -#@+others -#@-others -#@nonl -#@-node:jpenner.20091215224421.2:@thin ansi.py -#@-leo diff --git a/ansi_cython.pyx b/ansi_cython.pyx index 11091f7..5934cf2 100644 --- a/ansi_cython.pyx +++ b/ansi_cython.pyx @@ -1,6 +1,3 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20091212133112.2:@thin ansi_cython.pyx -#@@language python import config cdef extern from "stdio.h": @@ -15,8 +12,6 @@ cdef extern from "stdlib.h": size_t strlen(char *s) char *strcpy(char *dest, char *src) -#@+others -#@+node:jpenner.20091212133112.3:Codes esc = '%s['%chr(27) reset = '%s0m'%esc cls = '%s2j'%esc @@ -62,10 +57,6 @@ def Ctrl(ch): def FEnter(key): return key == "\n" or key == "\r" -#@nonl -#@-node:jpenner.20091212133112.3:Codes -#@+node:jpenner.20091212133112.4:Ach -# ANSI Character - contains prop and character cdef struct SAch: unsigned char ch @@ -162,8 +153,6 @@ cdef inline AstFromAch(int ach, int achPrev = achInvdI): assert csgr >= 0 and csgr <= 4, "more sgr possibilities, please handle" return ast -#@-node:jpenner.20091212133112.4:Ach -#@+node:jpenner.20091212133112.5:HTML mpch_entity = [0, 9786, 9787, 9829, 9830, 9827, 9824, 8226, 9688, 9675, 9689, 9794, 9792, 9834, 9835, 9788, 9658, 9668, 8597, 8252, 182, 167, 9644, 8616, 8593, 8595, 8594, 8592, 8735, 8596, 9650, 9660, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, @@ -202,8 +191,6 @@ cdef HstFromAch(int ach, int achPrev = achInvdI): rgst.append("" + str(entity) + ";") return ''.join(rgst) -#@-node:jpenner.20091212133112.5:HTML -#@+node:jpenner.20091212133112.6:Pos class Pos(object): def __init__(self, int w=config.W, int h=config.H, int x=1, int y=1): self.i = PosI(w, h, x, y) @@ -271,9 +258,6 @@ cdef class PosI(object): return True cdef ToPos(self): return Pos(self.w, self.h, self.X(), self.Y()) -#@nonl -#@-node:jpenner.20091212133112.6:Pos -#@+node:jpenner.20100105170222.1:Ascr class Ascr(object): def __init__(self, int w=config.W, int h=config.H, int achFill = achBlankI): @@ -313,8 +297,6 @@ class Ascr(object): cdef AscrI ascrI = self.i return ascrI.ZPos(xz, yz) - #@ @+others - #@+node:jpenner.20100105170222.2:Put def PutAch(self, int ach, int x, int y): cdef AscrI ascrI = self.i ascrI.PutAch(ach, x, y) @@ -338,9 +320,7 @@ class Ascr(object): def PutAscr(self, ascr, int x=1, int y=1): cdef AscrI ascrI = self.i ascrI.PutAscr(ascr.i, x, y) - #@nonl - #@-node:jpenner.20100105170222.2:Put - #@+node:jpenner.20100105170222.3:Diff + def AstDiff(self, ascr): cdef AscrI ascrI = self.i return ascrI.AstDiff(ascr.i) @@ -348,15 +328,9 @@ class Ascr(object): def Hst(self): cdef AscrI ascrI = self.i return ascrI.Hst() - #@-node:jpenner.20100105170222.3:Diff - #@+node:jpenner.20091212133112.10:Ast + def Ast(self): return Ascr(self.W(), self.H(), achInvdI).AstDiff(self) #stupid implementation - #@nonl - #@-node:jpenner.20091212133112.10:Ast - #@-others -#@-node:jpenner.20100105170222.1:Ascr -#@+node:jpenner.20091212133112.7:AscrI # ANSI Screen cdef class AscrI(object): @@ -376,8 +350,6 @@ cdef class AscrI(object): cdef Zpos(self, int xz, int yz): return Pos(self.w, self.h, xz + 1, yz + 1) - #@ @+others - #@+node:jpenner.20091212133112.8:Put cdef inline IAch(self, int xz, int yz): return xz + (self.w * yz) @@ -461,8 +433,7 @@ cdef class AscrI(object): iach = iach + 1 iachOther = iachOther + 1 yzOther = yzOther + 1 - #@-node:jpenner.20091212133112.8:Put - #@+node:jpenner.20091212133112.9:AstDiff + cdef AstDiff(self, AscrI ascr): assert self.w == ascr.w and self.h == ascr.h cdef int xz = 0 @@ -508,8 +479,7 @@ cdef class AscrI(object): xzPred = -1 yz = yz + 1 return "".join(rgast) - #@-node:jpenner.20091212133112.9:AstDiff - #@+node:jpenner.20091212133112.11:Hst + cdef Hst(self): rgst = ["
"] cdef int achPrev = achInvdI @@ -526,15 +496,6 @@ cdef class AscrI(object): rgst.append("") return ''.join(rgst) - #@-node:jpenner.20091212133112.11:Hst - #@-others -#@-node:jpenner.20091212133112.7:AscrI -#@+node:jpenner.20091212133112.12:FKeyPrintable + def FKeyPrintable(key): return type(key) == str and (ord(key) >= 32 and ord(key) <= 126) - -#@-node:jpenner.20091212133112.12:FKeyPrintable -#@-others -#@nonl -#@-node:jpenner.20091212133112.2:@thin ansi_cython.pyx -#@-leo diff --git a/ansi_python.py b/ansi_python.py index e4b38a0..29baa32 100644 --- a/ansi_python.py +++ b/ansi_python.py @@ -1,11 +1,6 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20090510085557.4:@thin ansi_python.py -#@@language python import config import numpy -#@+others -#@+node:jpenner.20091212133112.3:Codes esc = '%s['%chr(27) reset = '%s0m'%esc cls = '%s2j'%esc @@ -51,9 +46,7 @@ def Ctrl(ch): def FEnter(key): return key == "\n" or key == "\r" -#@nonl -#@-node:jpenner.20091212133112.3:Codes -#@+node:jpenner.20090510085557.6:Ach + # ANSI Character - contains prop and character class Ach(object): def __init__(self, ch, fgcol=WHITE, bgcol=BLACK): @@ -99,8 +92,6 @@ def AstFromAch(ach, achPrev = None): dtAch = numpy.dtype(object) -#@-node:jpenner.20090510085557.6:Ach -#@+node:jpenner.20091016050502.2:HTML mpch_entity = [0, 9786, 9787, 9829, 9830, 9827, 9824, 8226, 9688, 9675, 9689, 9794, 9792, 9834, 9835, 9788, 9658, 9668, 8597, 8252, 182, 167, 9644, 8616, 8593, 8595, 8594, 8592, 8735, 8596, 9650, 9660, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, @@ -133,9 +124,7 @@ def HstFromAch(ach, achPrev = None): else: rgst.append("" + str(mpch_entity[ord(ach.ch)]) + ";") return ''.join(rgst) -#@nonl -#@-node:jpenner.20091016050502.2:HTML -#@+node:jpenner.20090510085557.7:Pos + class Pos(object): def __init__(self, w=config.W, h=config.H, x=1, y=1): self.w = w @@ -166,8 +155,7 @@ class Pos(object): def Right(self): if self.xz < self.w - 1: self.xz = self.xz + 1 -#@-node:jpenner.20090510085557.7:Pos -#@+node:jpenner.20090510085557.8:Ascr + # ANSI Screen class Ascr(object): def __init__(self, w=config.W, h=config.H, achFill = None): @@ -182,8 +170,6 @@ class Ascr(object): def W(self): return self.w def H(self): return self.h - #@ @+others - #@+node:jpenner.20090526105844.8:Put def PutAch(self, ach, x, y): if not (x < 1 or y < 1 or x > self.w or y > self.h): #clip self.mpyzxz_ach[y-1][x-1] = ach @@ -226,8 +212,7 @@ class Ascr(object): if iachPut >= 0: self.PutRgach(rgachRow[iachPut:], x + iachPut, y + irow) iachPut = -1 - #@-node:jpenner.20090526105844.8:Put - #@+node:jpenner.20090527144214.3:Diff + def AstDiff(self, ascr): assert self.w == ascr.w and self.h == ascr.h rgast = [] @@ -261,14 +246,10 @@ class Ascr(object): xz = xz + 1 yz = yz + 1 return "".join(rgast) - #@nonl - #@-node:jpenner.20090527144214.3:Diff - #@+node:jpenner.20090529173104.26:Ast + def Ast(self): return Ascr(self.w, self.h, achInvd).AstDiff(self) #stupid implementation - #@nonl - #@-node:jpenner.20090529173104.26:Ast - #@+node:jpenner.20091016050502.3:Hst + def Hst(self): rgst = ["
"] achPrev = None @@ -279,16 +260,6 @@ class Ascr(object): rgst.append("") return ''.join(rgst) - #@nonl - #@-node:jpenner.20091016050502.3:Hst - #@-others -#@-node:jpenner.20090510085557.8:Ascr -#@+node:jpenner.20090521203229.341:FKeyPrintable + def FKeyPrintable(key): return type(key) == str and (ord(key) >= 32 and ord(key) <= 126) - -#@-node:jpenner.20090521203229.341:FKeyPrintable -#@-others -#@nonl -#@-node:jpenner.20090510085557.4:@thin ansi_python.py -#@-leo diff --git a/auth.py b/auth.py index bf3556b..e848c2d 100644 --- a/auth.py +++ b/auth.py @@ -1,5 +1,3 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20090607135901.1:@thin auth.py import MySQLdb import hashlib import config @@ -22,6 +20,3 @@ class DrupalAuth(object): return False finally: conn.close() - -#@-node:jpenner.20090607135901.1:@thin auth.py -#@-leo diff --git a/build_entity.py b/build_entity.py index 2abbacf..055fbf9 100644 --- a/build_entity.py +++ b/build_entity.py @@ -1,5 +1,3 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20091016050502.1:@thin build_entity.py import re reEnt = re.compile(r"^.*(\d+);.*$"); @@ -11,6 +9,3 @@ with open("cp437_html.txt") as fp: mpch_entity.append(int(ent)) print "mpch_entity = ", mpch_entity -#@nonl -#@-node:jpenner.20091016050502.1:@thin build_entity.py -#@-leo diff --git a/haxor.py b/haxor.py index 3474b26..2c1625c 100644 --- a/haxor.py +++ b/haxor.py @@ -1,14 +1,8 @@ -#@+leo-ver=4-thin -#@+node:jpenner.20090526212048.3:@thin haxor.py from engine import * from basetoken import * import telnet -#@<
") rgst.append("