From a22a7ff4d09fc481e6e96b3d78d28c297695ca25 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 30 Dec 2005 15:49:20 +0000 Subject: [PATCH] magic-removal: Removed some debug print statements git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1800 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/formfields.py | 7 +- django/db/models/base.py | 28 ++++---- django/db/models/manipulators.py | 107 +++++++++++++++---------------- 3 files changed, 70 insertions(+), 72 deletions(-) diff --git a/django/core/formfields.py b/django/core/formfields.py index 08c2af5102..c0e0594c57 100644 --- a/django/core/formfields.py +++ b/django/core/formfields.py @@ -63,7 +63,7 @@ class Manipulator(object): field.run_validator(new_data, val) except (validators.ValidationError, validators.CriticalValidationError), e: errors.setdefault(field.field_name, []).extend(e.messages) - + # if field.is_required and not new_data.get(field.field_name, False): # errors.setdefault(field.field_name, []).append(gettext_lazy('This field is required.')) # continue @@ -98,7 +98,6 @@ class Manipulator(object): must happen after validation because html2python functions aren't expected to deal with invalid input. """ - print "converting for ", self, self.fields for field in self.fields: field.convert_post_data(new_data) @@ -255,7 +254,7 @@ class InlineObjectCollection: cols = {} #orig = hasattr(self.parent_manipulator, 'original_object') and self.parent_manipulator.original_object or None #orig_list = self.rel_obj.get_list(orig) - + for i, manip in enumerate(self.child_manips) : if manip and not manip.needs_deletion: collection = {'original': manip.original_object} @@ -264,7 +263,7 @@ class InlineObjectCollection: data = field.extract_data(self.data) last_part = field.field_name[field.field_name.rindex('.') + 1:] collection[last_part] = FormFieldWrapper(field, data, errors) - + cols[i] = FormFieldCollection(collection) self._collections = cols diff --git a/django/db/models/base.py b/django/db/models/base.py index 88b7205015..98cc49e9f6 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -20,7 +20,7 @@ import os if not hasattr(__builtins__, 'set'): from sets import Set as set -attribute_transforms = { 'Admin': lambda cls: Admin(**cls.__dict__) } +attribute_transforms = {'Admin': lambda cls: Admin(**cls.__dict__)} class ModelBase(type): "Metaclass for all models" @@ -227,26 +227,26 @@ class Model(object): seen_objs = {} self.__collect_sub_objects(seen_objs) - #TODO: create a total class ordering rather than this sorting, which is - # only a partial ordering, and also is done each delete.. + #TODO: create a total class ordering rather than this sorting, which is + # only a partial ordering, and also is done each delete.. seen_cls = set(seen_objs.keys()) cls_order = list(seen_cls) cls_order.sort(cmp_cls) - + cursor = connection.cursor() - + for cls in cls_order: seen_objs[cls] = seen_objs[cls].items() seen_objs[cls].sort() for pk_val,(instance, do_delete) in seen_objs[cls]: - + # Run any pre-delete hooks. if do_delete: if hasattr(instance, '_pre_delete'): instance._pre_delete() - + dispatcher.send(signal=signals.pre_delete, sender=cls, instance=instance) - + for related in cls._meta.get_all_related_many_to_many_objects(): cursor.execute("DELETE FROM %s WHERE %s=%%s" % \ (backend.quote_name(related.field.get_m2m_db_table(related.opts)), @@ -257,27 +257,27 @@ class Model(object): (backend.quote_name(f.get_m2m_db_table(cls._meta)), backend.quote_name(cls._meta.object_name.lower() + '_id')), [pk_val]) - + for field in cls._meta.fields: if field.rel and field.null and field.rel.to in seen_cls: cursor.execute("UPDATE %s SET %s = NULL WHERE %s=%%s" % \ (backend.quote_name(cls._meta.db_table), backend.quote_name(field.column), backend.quote_name(cls._meta.pk.column)), [pk_val]) setattr(instance, field.attname, None) - + for cls in cls_order: seen_objs[cls].reverse() - + for pk_val, (instance, do_delete) in seen_objs[cls]: if do_delete: cursor.execute("DELETE FROM %s WHERE %s=%%s" % \ (backend.quote_name(cls._meta.db_table), backend.quote_name(cls._meta.pk.column)), [pk_val]) - + setattr(instance, cls._meta.pk.attname, None) - + dispatcher.send(signal=signals.post_delete, sender=cls, instance=instance) - + if hasattr(instance, '_post_delete'): instance._post_delete() diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py index d27e770f32..c95e8686a7 100644 --- a/django/db/models/manipulators.py +++ b/django/db/models/manipulators.py @@ -44,22 +44,22 @@ class ManipulatorDescriptor(object): class Naming(object): def __init__(self, name_parts): self.name_parts = name_parts - + def _get_dotted_name(self): if len(self.name_parts) == 0: return "" else: return ".".join(self.name_parts) + "." - + dotted_name = property(_get_dotted_name) name_prefix = dotted_name - + def _get_name(self): if len(self.name_parts) == 0: return "" else: return self.name[-1] - + name = property(_get_name) class AutomaticManipulator(Manipulator, Naming): @@ -93,7 +93,7 @@ class AutomaticManipulator(Manipulator, Naming): for f in self.opts.get_data_holders(self.follow): fol = self.follow[f.name] fields,manipulators = f.get_fields_and_manipulators(self.opts, self, follow=fol) - + if fields != None: self.fields_.extend(fields) if manipulators != None: @@ -109,7 +109,7 @@ class AutomaticManipulator(Manipulator, Naming): #l = list(self.fields_) #for child_manips in self.children.values(): # for manip in child_manips: - # if manip: + # if manip: # l.extend(manip.fields) #return l @@ -117,15 +117,15 @@ class AutomaticManipulator(Manipulator, Naming): def get_validation_errors(self, new_data): "Returns dictionary mapping field_names to error-message lists" - if self.needs_deletion or self.ignore_errors: + if self.needs_deletion or self.ignore_errors: return {} - + errors = super(AutomaticManipulator, self).get_validation_errors(new_data) - + for manips in self.children.values(): errors.update(manips.get_validation_errors(new_data)) return errors - + def do_html2python(self, new_data): super(AutomaticManipulator, self).do_html2python(new_data) for child in self.children.values(): @@ -154,7 +154,7 @@ class AutomaticManipulator(Manipulator, Naming): return self.model(**params) def _fill_data(self, expanded_data): - if self.needs_deletion: + if self.needs_deletion: raise BadCommand, "Filling %s with %r when it needs deletion" % (self, expanded_data) self.original_object = self.get_new_object(expanded_data) # TODO: many_to_many @@ -166,7 +166,7 @@ class AutomaticManipulator(Manipulator, Naming): expanded_data = dot_expand(new_data, MultiValueDict) # Deal with the effects of previous commands self._fill_data(expanded_data) - + def save_from_update(self, parent_key=None): if self.needs_deletion: if self.original_object != None: @@ -176,10 +176,10 @@ class AutomaticManipulator(Manipulator, Naming): self.original_object.save() if not hasattr(self, 'obj_key'): self.obj_key = getattr(self.original_object, self.opts.pk.attname) - + for related, manips in self.children.items(): manips.save_from_update(self.obj_key) - + return self.original_object def do_command(self, command): @@ -197,30 +197,30 @@ class AutomaticManipulator(Manipulator, Naming): else: # must be the name of a child manipulator collection child_manips = None - for rel,manips in self.children.items(): + for rel,manips in self.children.items(): if rel.var_name == part: child_manips = manips break - if child_manips == None: + if child_manips == None: raise BadCommand, "'%s' : unknown manipulator collection name." % (part,) else: child_manips._do_command_expanded(command_parts) - - + + def save(self, new_data): self.update(new_data) self.save_from_update() return self.original_object - -# def _save_expanded(self, expanded_data, overrides = None): + +# def _save_expanded(self, expanded_data, overrides = None): # add, change, opts, klass = self.add, self.change, self.opts, self.model -# +# # new_object = self.get_new_object(expanded_data, overrides) # # # First, save the basic object itself. # new_object.save() # -# # Save the key for use in creating new related objects. +# # Save the key for use in creating new related objects. # if not hasattr(self, 'obj_key'): # self.obj_key = getattr(new_object, self.opts.pk.attname) # @@ -230,8 +230,8 @@ class AutomaticManipulator(Manipulator, Naming): # f.save_file(new_data, new_object, change and self.original_object or None, change) # # # Calculate which primary fields have changed. -# -# +# +# # # for f in opts.fields: # # if not f.primary_key and str(getattr(self.original_object, f.attname)) != str(getattr(new_object, f.attname)): # # self.fields_changed.append(f.verbose_name) @@ -247,10 +247,10 @@ class AutomaticManipulator(Manipulator, Naming): # was_changed = getattr(new_object, 'set_%s' % f.name)(new_vals) # if change and was_changed: # self.fields_changed.append(f.verbose_name) -# +# # # Save inline edited objects # self._fill_related_objects(expanded_data,SaveHelper) -# +# # return new_object # # # Save the order, if applicable. @@ -264,17 +264,17 @@ class AutomaticManipulator(Manipulator, Naming): def flatten_data(self): new_data = {} - - for f in self.opts.fields + self.opts.many_to_many: + + for f in self.opts.fields + self.opts.many_to_many: fol = self.follow.get(f.name, None) if fol: new_data.update(f.flatten_data(fol, self.original_object)) for rel, child_manips in self.children.items(): child_data = child_manips.flatten_data() new_data.update(child_data) - + prefix = self.name_prefix - new_data = dict([(prefix + k, v) for k,v in new_data.items()]) + new_data = dict([(prefix + k, v) for k,v in new_data.items()]) return new_data class ModelAddManipulator(AutomaticManipulator): @@ -285,7 +285,7 @@ class ModelAddManipulator(AutomaticManipulator): def get_original_value(self, field): return field.get_default() - + def __repr__(self): return "" % (self.name_prefix, self.model.__name__, ) @@ -320,7 +320,7 @@ class ModelChangeManipulator(AutomaticManipulator): original_object = opts.get_model_module().Klass(**params) else: raise - + super(ModelChangeManipulator, self).__init__(original_object=original_object, follow=follow, name_parts=name_parts) #self.original_object = original_object @@ -330,7 +330,7 @@ class ModelChangeManipulator(AutomaticManipulator): self.fields_added, self.fields_changed, self.fields_deleted = [], [], [] def get_original_value(self, field): - return getattr(self.original_object, field.attname) + return getattr(self.original_object, field.attname) def __repr__(self): return "" % (self.name_prefix, self.model.__name__, self.obj_key) @@ -341,24 +341,24 @@ class ManipulatorCollection(list, Naming): self.model = model self.follow = follow self._load() - + def _get_list(self): return self.model._default_manager.get_list() def _load(self): man_class = self.model.ChangeManipulator - + for i,obj in enumerate(self._get_list()): self.append(man_class(obj,self.follow, self.name_parts + (str(i),) )) - + def _save_child(self, manip, parent_key): manip.save_from_update() - + def save_from_update(self, parent_key=None): for manip in self: if manip: self._save_child(manip, parent_key) - + def _fill_data(self, expanded_data): for index,manip in enumerate(self): obj_data = expanded_data.get(str(index), None) @@ -376,10 +376,10 @@ class ManipulatorCollection(list, Naming): items.sort(cmp = lambda x, y: cmp(x[0], y[0])) for index, obj_data in items: child_manip = self.add_child(index) - #HACK: this data will not have been converted to python form yet. + #HACK: this data will not have been converted to python form yet. #child_manip.do_html2python(obj_data) child_manip._fill_data(obj_data) - + def _do_command_expanded(self, command_parts): # The next part could be an index of a manipulator, # or it could be a command on the collection. @@ -393,24 +393,24 @@ class ManipulatorCollection(list, Naming): manip = self[index] except IndexError: raise BadCommand, "No %s manipulator found for index %s in command." % (part, index) - + if manip == None: raise BadCommand, "No %s manipulator found for index %s in command." % (part, index) - + manip._do_command_expanded(command_parts) except ValueError: command_name = index_part - # Must be a command on the collection. Possible commands: - # add. + # Must be a command on the collection. Possible commands: + # add. # TODO: page.forward, page.back, page.n, swap.n.m if command_name == "add": child_manip = self.add_child() - # Don't show validation stuff for things just added. + # Don't show validation stuff for things just added. child_manip.ignore_errors = True elif command_name == "swap": order_field = self.model._meta.order_with_respect_to if not order_field: - raise BadCommand, "Swap command recieved on unordered ManipulatorCollection" + raise BadCommand, "Swap command recieved on unordered ManipulatorCollection" try: manip1 = self[int(command_parts.pop(0))] manip2 = self[int(command_parts.pop(0))] @@ -421,14 +421,14 @@ class ManipulatorCollection(list, Naming): else: # Set the ordering field value on the objects in the manipulators. # This will make sure they are put in a different when rendered on the form. - # The indices in this collection will stay the same. + # The indices in this collection will stay the same. temp = getattr(manip1.original_object, order_field.attname) - setattr(manip1.original_object, order_field.attname, + setattr(manip1.original_object, order_field.attname, getattr(manip2.original_object, order_field.attname)) setattr(manip2.original_object, order_field.attname, temp) else: raise BadCommand, "%s, unknown command" % (command_name) - + def add_child(self, index = None): man_class = self.model.AddManipulator if index == None: @@ -436,10 +436,10 @@ class ManipulatorCollection(list, Naming): # Make sure that we are going to put this in the right index, by prefilling with Nones. for i in range(len(self), index + 1): self.append(None) - + prefix = '%s%s.' % (self.name_prefix, index ) child_manip = man_class(self.follow, self.name_parts + ( str(index), ) ) - + self[index] = child_manip return child_manip @@ -450,7 +450,7 @@ class ManipulatorCollection(list, Naming): manip_data = manip.flatten_data() new_data.update(manip_data) return new_data - + def get_validation_errors(self, new_data): "Returns dictionary mapping field_names to error-message lists" errors = {} @@ -458,9 +458,8 @@ class ManipulatorCollection(list, Naming): if manip: errors.update(manip.get_validation_errors(new_data)) return errors - + def do_html2python(self, new_data): - print "coll: ", self for manip in self: if manip: manip.do_html2python(new_data)