From dd1452672d65fdc3f52d8efef6d86e42abb9d95e Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 20 Aug 2012 09:26:32 +0400 Subject: Errors according to the GNU Coding Standards --- gstudio/xmlrpc/metaweblog.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gstudio') diff --git a/gstudio/xmlrpc/metaweblog.py b/gstudio/xmlrpc/metaweblog.py index 91d9eda..2e5e03d 100644 --- a/gstudio/xmlrpc/metaweblog.py +++ b/gstudio/xmlrpc/metaweblog.py @@ -837,7 +837,7 @@ def set_relation(d,obj1,obj2) : except Relationtype.DoesNotExist : return "Relationtype Does Not Exist" -# Previous version of the following methods +# Previous version of ``show_id`` and ``show_instance`` # @xmlrpc_func(returns='list') # def list_id(): @@ -870,8 +870,7 @@ def instance_checker(m, instance, option, id=None): if option == "all": return [id.id for id in cc[i].objects.all()] else: - # http://www.gnu.org/prep/standards/html_node/Errors.html#Errors - sys.stderr.write("metaweblog.py:line872: Wrong arguments\n") + sys.stderr.write("metaweblog.py:865-871: Wrong arguments\n") @xmlrpc_func(returns="struct", args=["string", "string"]) def show_id(module=None, instance=None): @@ -893,7 +892,7 @@ def show_id(module=None, instance=None): return gstres, objres else: - sys.stderr.write("metaweblog.py:line870: Wrong arguments\n") + sys.stderr.write("metaweblog.py:877-892: Wrong arguments\n") @xmlrpc_func(returns="struct", args=["string", "string", "string"]) def show_instance(module=None, instance=None, id=None): @@ -934,8 +933,8 @@ def show_instance(module=None, instance=None, id=None): return res else: - sys.stderr.write("metaweblog.py:line898: Wrong arguments\n") + sys.stderr.write("metaweblog.py:900-933: Wrong arguments\n") except ObjectDoesNotExist: - sys.stderr.write("metaweblog.py:line901: " + + sys.stderr.write("metaweblog.py:900-933: " "Object matching query does not exist\n") -- cgit v1.1 From 914f6627ed23d7ea01cd09a429193dbe5753a0da Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 20 Aug 2012 09:28:51 +0400 Subject: Fixed error messages; instance option --- gstudio/management/commands/sync-instances.py | 35 ++++++++++++++++++--------- 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'gstudio') diff --git a/gstudio/management/commands/sync-instances.py b/gstudio/management/commands/sync-instances.py index 632e9ef..20607bb 100644 --- a/gstudio/management/commands/sync-instances.py +++ b/gstudio/management/commands/sync-instances.py @@ -20,10 +20,6 @@ import re import sys from datetime import datetime -from objectapp.models import Gbobject -from objectapp.models import Objecttype -from objectapp.models import Attributetype -from objectapp.models import Relationtype from objectapp.models import ObjectDoesNotExist # from gstudio.xmlrpc.metaweblog import class_checker @@ -40,7 +36,9 @@ class Command(BaseCommand): """Gets all Gbobjects from a specified server""" option_list = BaseCommand.option_list + ( make_option("--server", action="store", type="string", - dest="server", help="Specify an ip"),) + dest="server", help="Specify IP address or URI"), + make_option("--instance", action="store", type="string", + dest="instance", help="Specify an instance"),) def handle(self, *args, **options): def class_checker(m): @@ -83,8 +81,9 @@ class Command(BaseCommand): def str_to_int(string): return [int(x) for x in string] + # Weird check for DateTime objects + for key in i.keys(): - # Weird check for DateTime objects if "make_comparable" in dir(i[key]): dt = DateTime().make_comparable(i[key])[1] dt = str_to_int(group(re.search(pattern, dt))) @@ -94,19 +93,31 @@ class Command(BaseCommand): class_checker(module)[instance](**i).save() except (ObjectDoesNotExist, IntegrityError): - sys.stderr.write("Object matching query does not exist\n") + sys.stderr.write("sync-instances.py:55: " + "Object matching query does not exist\n") except ValueError: - sys.stderr.write("Object already exists\n") + sys.stderr.write("sync-instances.py:93: " + "Object already exists\n") server = options["server"] srv = ServerProxy(server, allow_none=True) + instance = options["instance"] + objcc = class_checker(objmodels) gstcc = class_checker(gstmodels) - for i in objcc.keys(): - parse("objectapp.models", i) + if instance: + if instance in objkeys: + parse("objectapp.models", instance) + + if instance in gstkeys: + parse("gstudio.models", instance) + + else: + for i in objkeys: + parse("objectapp.models", i) - for i in gstcc.keys(): - parse("gstudio.models", i) + for i in gstkeys: + parse("gstudio.models", i) -- cgit v1.1 From b125dac2199dd14af2c3887677c8e25c4c630499 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 20 Aug 2012 09:32:54 +0400 Subject: Disabled sync-gbobjects.py --- gstudio/management/commands/sync-gbobjects.py | 112 +++++++++++++------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'gstudio') diff --git a/gstudio/management/commands/sync-gbobjects.py b/gstudio/management/commands/sync-gbobjects.py index faf4274..2e8c955 100644 --- a/gstudio/management/commands/sync-gbobjects.py +++ b/gstudio/management/commands/sync-gbobjects.py @@ -13,59 +13,59 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.core.management.base import BaseCommand -from optparse import make_option - -import re -from datetime import datetime -from objectapp.models import Gbobject -from xmlrpclib import DateTime -from xmlrpclib import ServerProxy - -class Command(BaseCommand): - """Gets all Gbobjects for a specified server""" - option_list = BaseCommand.option_list + ( - make_option("--server", action="store", type="string", - dest="server", help="Specify an ip"),) - - def handle(self, *args, **options): - def parse_id(id=None): - def inner_parse(id): - """Gets a dict, parses and saves it""" - dict = srv.metaWeblog.dict_id(id) - pattern = "^(\d{4})(\d{2})(\d{2}).(\d{2}).(\d{2}).(\d{2})$" - - cd = DateTime().make_comparable(dict['creation_date'])[1] - lu = DateTime().make_comparable(dict['last_update'])[1] - ep = DateTime().make_comparable(dict['end_publication'])[1] - sp = DateTime().make_comparable(dict['start_publication'])[1] - - def group(value): - return value.group(1, 2, 3, 4, 5, 6) - - cd = group(re.search(pattern, cd)) - lu = group(re.search(pattern, lu)) - ep = group(re.search(pattern, ep)) - sp = group(re.search(pattern, sp)) - - def str_to_int(string): - return [int(x) for x in string] - - cd = str_to_int(cd) - lu = str_to_int(lu) - ep = str_to_int(ep) - sp = str_to_int(sp) - - dict['creation_date'] = datetime(*cd) - dict['last_update'] = datetime(*lu) - dict['end_publication'] = datetime(*ep) - dict['start_publication'] = datetime(*sp) - - Gbobject(**dict).save() - - for d in srv.metaWeblog.dict_id(): - inner_parse(d['node_ptr_id']) - - server = options["server"] - srv = ServerProxy(server, allow_none=True) - parse_id() +# from django.core.management.base import BaseCommand +# from optparse import make_option + +# import re +# from datetime import datetime +# from objectapp.models import Gbobject +# from xmlrpclib import DateTime +# from xmlrpclib import ServerProxy + +# class Command(BaseCommand): +# """Gets all Gbobjects for a specified server""" +# option_list = BaseCommand.option_list + ( +# make_option("--server", action="store", type="string", +# dest="server", help="Specify an ip"),) + +# def handle(self, *args, **options): +# def parse_id(id=None): +# def inner_parse(id): +# """Gets a dict, parses and saves it""" +# dict = srv.metaWeblog.dict_id(id) +# pattern = "^(\d{4})(\d{2})(\d{2}).(\d{2}).(\d{2}).(\d{2})$" + +# cd = DateTime().make_comparable(dict['creation_date'])[1] +# lu = DateTime().make_comparable(dict['last_update'])[1] +# ep = DateTime().make_comparable(dict['end_publication'])[1] +# sp = DateTime().make_comparable(dict['start_publication'])[1] + +# def group(value): +# return value.group(1, 2, 3, 4, 5, 6) + +# cd = group(re.search(pattern, cd)) +# lu = group(re.search(pattern, lu)) +# ep = group(re.search(pattern, ep)) +# sp = group(re.search(pattern, sp)) + +# def str_to_int(string): +# return [int(x) for x in string] + +# cd = str_to_int(cd) +# lu = str_to_int(lu) +# ep = str_to_int(ep) +# sp = str_to_int(sp) + +# dict['creation_date'] = datetime(*cd) +# dict['last_update'] = datetime(*lu) +# dict['end_publication'] = datetime(*ep) +# dict['start_publication'] = datetime(*sp) + +# Gbobject(**dict).save() + +# for d in srv.metaWeblog.dict_id(): +# inner_parse(d['node_ptr_id']) + +# server = options["server"] +# srv = ServerProxy(server, allow_none=True) +# parse_id() -- cgit v1.1 From 1172262373b8b18b6266f49d62e8dc917e007ee5 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 20 Aug 2012 09:40:07 +0400 Subject: Removed identifier --- gstudio/models.py | 242 ------------------------------------------------------ 1 file changed, 242 deletions(-) (limited to 'gstudio') diff --git a/gstudio/models.py b/gstudio/models.py index 17fa459..cd529c4 100644 --- a/gstudio/models.py +++ b/gstudio/models.py @@ -166,12 +166,6 @@ attr_counter = -1 class Author(User): """Proxy Model around User""" - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Author", - help_text=("class' id"), - max_length=255) - objects = models.Manager() published = AuthorPublishedManager() @@ -198,12 +192,6 @@ class NID(models.Model): the network, including edges. Edges are also first class citizens in the gnowledge base. """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="NID", - help_text=("class' id"), - max_length=255) - title = models.CharField(_('title'), help_text=_('give a name to the node'), max_length=255) last_update = models.DateTimeField(_('last update'), default=datetime.now) creation_date = models.DateTimeField(_('creation date'), @@ -433,12 +421,6 @@ class Node(NID): Super class """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Node", - help_text=("class' id"), - max_length=255) - altnames = TagField(_('alternate names'), help_text=_('alternate names if any'), blank=True, null=True) plural = models.CharField(_('plural name'), help_text=_('plural form of the node name if any'), max_length=255, blank=True, null=True) rating = RatingField(range=5, can_change_vote = True, help_text=_('your rating'), blank=True, null=True) @@ -475,12 +457,6 @@ class Metatype(Node): Metatype object for Nodetype """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Metatype", - help_text=("class' id"), - max_length=255) - description = models.TextField(_('description'), blank=True, null=True) parent = models.ForeignKey('self', null=True, blank=True, verbose_name=_('parent metatype'), related_name='children') @@ -682,12 +658,6 @@ class Metatype(Node): class Edge(NID): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Edge", - help_text=("class' id"), - max_length=255) - metatypes = models.ManyToManyField(Metatype, verbose_name=_('member of metatypes'), related_name='member_edges', blank=True, null=True) @@ -713,12 +683,6 @@ class Nodetype(Node): Model design for publishing nodetypes. Other nodetypes inherit this class. """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Nodetype", - help_text=("class' id"), - max_length=255) - STATUS_CHOICES = ((DRAFT, _('draft')), (HIDDEN, _('hidden')), (PUBLISHED, _('published'))) @@ -1368,12 +1332,6 @@ class Objecttype(Nodetype): Object class ''' - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Objecttype", - help_text=("class' id"), - max_length=255) - def __unicode__(self): displayname="OT: "+self.title return displayname @@ -1703,12 +1661,6 @@ class Relationtype(Nodetype): Properties with left and right subjects (Binary relations) are defined in this class. ''' - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Relationtype", - help_text=("class' id"), - max_length=255) - inverse = models.CharField(_('inverse name'), help_text=_('when subjecttypes are interchanged, what should be the name of the relation type? This is mandatory field. If the relation is symmetric, same name will do.'), max_length=255,db_index=True ) left_subjecttype = models.ForeignKey(NID,related_name="left_subjecttype_of", verbose_name='left role') left_applicable_nodetypes = models.CharField(max_length=2,choices=NODETYPE_CHOICES,default='OT', verbose_name='Applicable node types for left role') @@ -1928,12 +1880,6 @@ class Attributetype(Nodetype): field is selected for datatype. ''' - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Attributetype", - help_text=("class' id"), - max_length=255) - subjecttype = models.ForeignKey(NID, related_name="subjecttype_of", verbose_name='subject type name') applicable_nodetypes = models.CharField(max_length=2,choices=NODETYPE_CHOICES,default='OT', verbose_name='applicable nodetypes') dataType = models.CharField(max_length=2, choices=FIELD_TYPE_CHOICES,default='01', verbose_name='data type of value') @@ -2134,12 +2080,6 @@ class Relation(Edge): Relations, instances of relationtypes ''' - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Relation", - help_text=("class' id"), - max_length=255) - left_subject_scope = models.CharField(max_length=50, verbose_name='subject scope or qualification', null=True, blank=True) left_subject = models.ForeignKey(NID, related_name="left_subject_of", verbose_name='subject name') relationtype_scope = models.CharField(max_length=50, verbose_name='relation scope or qualification', null=True, blank=True) @@ -2250,12 +2190,6 @@ class Attribute(Edge): nodetypes. ''' - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Attribute", - help_text=("class' id"), - max_length=255) - subject_scope = models.CharField(max_length=50, verbose_name='subject scope or qualification', null=True, blank=True) subject = models.ForeignKey(NID, related_name="subject_of", verbose_name='subject name') attributetype_scope = models.CharField(max_length=50, verbose_name='property scope or qualification', null=True, blank=True) @@ -2343,12 +2277,6 @@ class Attribute(Edge): class AttributeCharField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeCharField", - help_text=("class' id"), - max_length=255) - value = models.CharField(max_length=100, verbose_name='string') def __unicode__(self): @@ -2371,12 +2299,6 @@ class AttributeCharField(Attribute): class AttributeTextField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeTextField", - help_text=("class' id"), - max_length=255) - value = models.TextField(verbose_name='text') def __unicode__(self): @@ -2397,12 +2319,6 @@ class AttributeTextField(Attribute): class AttributeIntegerField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeIntegerField", - help_text=("class' id"), - max_length=255) - value = models.IntegerField(max_length=100, verbose_name='Integer') def __unicode__(self): @@ -2424,13 +2340,6 @@ class AttributeIntegerField(Attribute): class AttributeCommaSeparatedIntegerField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeComma" + - "SeparatedIntegerField", - help_text=("class' id"), - max_length=255) - value = models.CommaSeparatedIntegerField(max_length=100, verbose_name='integers separated by comma') def __unicode__(self): @@ -2451,12 +2360,6 @@ class AttributeCommaSeparatedIntegerField(Attribute): class AttributeBigIntegerField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeBigIntegerField", - help_text=("class' id"), - max_length=255) - value = models.BigIntegerField(max_length=100, verbose_name='big integer') def __unicode__(self): @@ -2478,13 +2381,6 @@ class AttributeBigIntegerField(Attribute): class AttributePositiveIntegerField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributePositive" + - "IntegerField", - help_text=("class' id"), - max_length=255) - value = models.PositiveIntegerField(max_length=100, verbose_name='positive integer') def __unicode__(self): @@ -2506,12 +2402,6 @@ class AttributePositiveIntegerField(Attribute): class AttributeDecimalField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeDecimalField", - help_text=("class' id"), - max_length=255) - value = models.DecimalField(max_digits=3, decimal_places=2, verbose_name='decimal') def __unicode__(self): @@ -2530,12 +2420,6 @@ class AttributeDecimalField(Attribute): class AttributeFloatField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeFloatField", - help_text=("class' id"), - max_length=255) - value = models.FloatField(max_length=100, verbose_name='number as float') def __unicode__(self): @@ -2557,12 +2441,6 @@ class AttributeFloatField(Attribute): class AttributeBooleanField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeBooleanField", - help_text=("class' id"), - max_length=255) - value = models.BooleanField(verbose_name='boolean') def __unicode__(self): @@ -2582,12 +2460,6 @@ class AttributeBooleanField(Attribute): class AttributeNullBooleanField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeNullBooleanField", - help_text=("class' id"), - max_length=255) - value = models.NullBooleanField(verbose_name='true false or unknown') def __unicode__(self): @@ -2609,12 +2481,6 @@ class AttributeNullBooleanField(Attribute): class AttributeDateField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeDateField", - help_text=("class' id"), - max_length=255) - value = models.DateField(max_length=100, verbose_name='date') def __unicode__(self): @@ -2636,12 +2502,6 @@ class AttributeDateField(Attribute): class AttributeDateTimeField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeDateTimeField", - help_text=("class' id"), - max_length=255) - value = models.DateTimeField(max_length=100, verbose_name='date time') def __unicode__(self): @@ -2663,12 +2523,6 @@ class AttributeDateTimeField(Attribute): class AttributeTimeField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeTimeField", - help_text=("class' id"), - max_length=255) - value = models.TimeField(max_length=100, verbose_name='time') def __unicode__(self): @@ -2690,12 +2544,6 @@ class AttributeTimeField(Attribute): class AttributeEmailField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeEmailField", - help_text=("class' id"), - max_length=255) - value = models.EmailField(max_length=100,verbose_name='value') def __unicode__(self): @@ -2717,12 +2565,6 @@ class AttributeEmailField(Attribute): class AttributeFileField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeFileField", - help_text=("class' id"), - max_length=255) - value = models.FileField(upload_to='media/'+UPLOAD_TO, verbose_name='file') def __unicode__(self): @@ -2744,12 +2586,6 @@ class AttributeFileField(Attribute): class AttributeFilePathField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeFilePathField", - help_text=("class' id"), - max_length=255) - value = models.FilePathField(verbose_name='path of file') def __unicode__(self): @@ -2771,12 +2607,6 @@ class AttributeFilePathField(Attribute): class AttributeImageField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeImageField", - help_text=("class' id"), - max_length=255) - value = models.ImageField(upload_to = UPLOAD_TO, verbose_name='image') def __unicode__(self): @@ -2798,12 +2628,6 @@ class AttributeImageField(Attribute): class AttributeURLField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeURLField", - help_text=("class' id"), - max_length=255) - value = models.URLField(max_length=100, verbose_name='url') def __unicode__(self): @@ -2825,12 +2649,6 @@ class AttributeURLField(Attribute): class AttributeIPAddressField(Attribute): - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeIPAddressField", - help_text=("class' id"), - max_length=255) - value = models.IPAddressField(max_length=100, verbose_name='ip address') def __unicode__(self): @@ -2858,12 +2676,6 @@ class Processtype(Nodetype): objects involving change. """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Processtype", - help_text=("class' id"), - max_length=255) - changing_attributetype_set = models.ManyToManyField(Attributetype, null=True, blank=True, verbose_name=_('attribute set involved in the process'), related_name=' changing_attributetype_set_of') @@ -2903,12 +2715,6 @@ class Systemtype(Nodetype): class to organize Systems """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Systemtype", - help_text=("class' id"), - max_length=255) - nodetype_set = models.ManyToManyField(Nodetype, related_name="nodetype_set_of", verbose_name='Possible edges in the system', blank=True, null=False) relationtype_set = models.ManyToManyField(Relationtype, related_name="relationtype_set_of", verbose_name='Possible nodetypes in the system', @@ -2954,12 +2760,6 @@ class AttributeSpecification(Node): another sentence. """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="AttributeSpecification", - help_text=("class' id"), - max_length=255) - attributetype = models.ForeignKey(Attributetype, verbose_name='property name') subjects = models.ManyToManyField(NID, related_name="subjects_attrspec_of", verbose_name='subjects') metatypes=models.ManyToManyField(Metatype,verbose_name=_('member of metatypes'), @@ -3006,12 +2806,6 @@ class RelationSpecification(Node): specifying a relation with a subject """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="RelationSpecification", - help_text=("class' id"), - max_length=255) - relationtype = models.ForeignKey(Relationtype, verbose_name='relation name') subjects = models.ManyToManyField(NID, related_name="subjects_in_relspec", verbose_name='subjects') metatypes=models.ManyToManyField(Metatype,verbose_name=_('member of metatypes'), @@ -3056,12 +2850,6 @@ class NodeSpecification(Node): A node specified (described) by its relations or attributes or both. """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="NodeSpecification", - help_text=("class' id"), - max_length=255) - subject = models.ForeignKey(Node, related_name="subject_nodespec", verbose_name='subject name') relations = models.ManyToManyField(Relation, related_name="relations_in_nodespec", verbose_name='relations used to specify the domain') attributes = models.ManyToManyField(Attribute, related_name="attributes_in_nodespec", verbose_name='attributes used to specify the domain') @@ -3110,12 +2898,6 @@ class Expression(Node): Expression constructor """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Expression", - help_text=("class' id"), - max_length=255) - left_term = models.ForeignKey(NID, related_name="left_term_of", verbose_name='left term name') relationtype = models.ForeignKey(Relationtype, verbose_name='relation name') right_term = models.ForeignKey(NID, related_name="right_term_of", verbose_name='right term name') @@ -3159,12 +2941,6 @@ class Union(Node): union of two classes """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Union", - help_text=("class' id"), - max_length=255) - nodetypes = models.ManyToManyField(Nodetype, related_name = 'union_of', verbose_name='node types for union') metatypes=models.ManyToManyField(Metatype,verbose_name=_('member of metatypes'), related_name='member_unions', @@ -3198,12 +2974,6 @@ class Complement(Node): complement of a class """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Complement", - help_text=("class' id"), - max_length=255) - nodetypes = models.ManyToManyField(Nodetype, related_name = 'complement_of', verbose_name='complementary nodes') metatypes=models.ManyToManyField(Metatype,related_name='meta_complement',verbose_name=_('Metanodes'), blank=True, null= True) @@ -3237,12 +3007,6 @@ class Intersection(Node): Intersection of classes """ - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Intersection", - help_text=("class' id"), - max_length=255) - nodetypes = models.ManyToManyField(Nodetype, related_name = 'intersection_of', verbose_name='intersection of classes') metatypes=models.ManyToManyField(Metatype,verbose_name=_('member of metatypes'), related_name='member_intersectn', @@ -3322,12 +3086,6 @@ post_save.connect(ping_external_urls_handler, sender=Nodetype, class Peer(User): """Subclass for non-human users""" - def __init__(self): - self.identifier = models.CharField(("identifier"), - default="Peer", - help_text=("class' id"), - max_length=255) - def __unicode__(self): return self.ip -- cgit v1.1