X-Git-Url: https://blacka.com/cgi-bin/gitweb.cgi?p=python-rwhoisd.git;a=blobdiff_plain;f=rwhoisd%2FRwhois.py;h=265d520249f949f02a90113d5d558d7129ea3423;hp=54c37d1d9486a1aad069344d23e363b0188095b7;hb=HEAD;hpb=a6b5f5371ee8a2510703e0f6f491df9f8065e622 diff --git a/rwhoisd/Rwhois.py b/rwhoisd/Rwhois.py index 54c37d1..265d520 100644 --- a/rwhoisd/Rwhois.py +++ b/rwhoisd/Rwhois.py @@ -1,3 +1,22 @@ +# This file is part of python-rwhoisd +# +# Copyright (C) 2003, David E. Blacka +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + # This modules contains classes that are fairly general to RWhois # server operation. @@ -83,6 +102,9 @@ class rwhoisobject: returned.""" return self.data.get(attr.strip().lower(), [default])[0] + + def has_attr(self, attr): + return self.data.has_key(attr.strip().lower()) def getid(self): """Return the RWhois ID of this object.""" @@ -134,8 +156,11 @@ class rwhoisobject: res = '\r\n'.join([ prefix + ':'.join(x) for x in items ]) else: res = '\r\n'.join([ ':'.join(x) for x in items ]) - - return res; + + if not res.endswith("\r\n"): + res += "\r\n" + + return res def to_wire_str(self, prefix=None): """Return the response formatted string (classname:attr:value)"""