Skip to content

Commit

Permalink
FIX: Do not use print
Browse files Browse the repository at this point in the history 
modwsgi, and others do not like that
  • Loading branch information
@bmihelac
bmihelac committed Jun 1, 2012
1 parent 224712d commit 7b05baf
Showing 1 changed file with 37 additions and 35 deletions.
72 changes: 37 additions & 35 deletions reversion_compare/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:copyleft: 2012 by the django-reversion-compare team, see AUTHORS for more details.
:license: GNU GPL v3 or above, see LICENSE for more details.
"""

import logging

from django import template
from django.conf.urls.defaults import patterns, url
Expand All @@ -33,6 +33,8 @@
from reversion import get_adapter


logger = logging.getLogger(__name__)

VERSION_TYPE_DICT = dict(VERSION_TYPE_CHOICES)


Expand Down Expand Up @@ -119,10 +121,10 @@ def get_many_to_many(self):
content_type=ContentType.objects.get_for_model(related_model),
object_id__in=ids
)
# print "m2m queryset:", queryset
# logger.debug("m2m queryset:", queryset)

versions = sorted(list(queryset))
# print "versions:", versions
# logger.debug("versions:", versions)

if self.has_int_pk:
# The primary_keys would be stored in a text field -> convert it to integers
Expand All @@ -139,7 +141,7 @@ def get_many_to_many(self):
target_ids = set(ids)
actual_ids = set([version.object_id for version in versions])
missing_ids1 = target_ids.difference(actual_ids)
# print self.field_name, "target: %s - actual: %s - missing: %s" % (target_ids, actual_ids, missing_ids1)
# logger.debug(self.field_name, "target: %s - actual: %s - missing: %s" % (target_ids, actual_ids, missing_ids1))
if missing_ids1:
missing_objects = related_model.objects.all().filter(pk__in=missing_ids1)
missing_ids = list(target_ids.difference(set(missing_objects.values_list('pk', flat=True))))
Expand Down Expand Up @@ -190,7 +192,7 @@ def debug(self):
if not settings.DEBUG:
return
for item in self.get_debug():
print item
logger.debug(item)


class CompareObjects(object):
Expand Down Expand Up @@ -270,22 +272,22 @@ def get_m2m_change_info(self):
# missing_objects_pk2 = [obj.pk for obj in missing_objects2]
missing_objects_dict2 = dict([(obj.pk, obj) for obj in missing_objects2])

# print "missing_objects1:", missing_objects1
# print "missing_objects2:", missing_objects2
# print "missing_ids1:", missing_ids1
# print "missing_ids2:", missing_ids2
# logger.debug("missing_objects1:", missing_objects1)
# logger.debug("missing_objects2:", missing_objects2)
# logger.debug("missing_ids1:", missing_ids1)
# logger.debug("missing_ids2:", missing_ids2)

missing_object_set1 = set(missing_objects1)
missing_object_set2 = set(missing_objects2)
# print missing_object_set1, missing_object_set2
# logger.debug(missing_object_set1, missing_object_set2)

same_missing_objects = missing_object_set1.intersection(missing_object_set2)
removed_missing_objects = missing_object_set1.difference(missing_object_set2)
added_missing_objects = missing_object_set2.difference(missing_object_set1)

# print "same_missing_objects:", same_missing_objects
# print "removed_missing_objects:", removed_missing_objects
# print "added_missing_objects:", added_missing_objects
# logger.debug("same_missing_objects:", same_missing_objects)
# logger.debug("removed_missing_objects:", removed_missing_objects)
# logger.debug("added_missing_objects:", added_missing_objects)


# Create same_items, removed_items, added_items with related m2m items
Expand All @@ -301,8 +303,8 @@ def get_m2m_change_info(self):
result_dict1 = dict([(version.object_id, version) for version in result1])
result_dict2 = dict([(version.object_id, version) for version in result2])

# print result_dict1
# print result_dict2
# logger.debug(result_dict1)
# logger.debug(result_dict2)

for primary_key in set(primary_keys1).union(set(primary_keys2)):
if primary_key in result_dict1:
Expand All @@ -315,19 +317,19 @@ def get_m2m_change_info(self):
else:
version2 = None

#print "%r - %r - %r" % (primary_key, version1, version2)
#logger.debug("%r - %r - %r" % (primary_key, version1, version2))

if version1 is not None and version2 is not None:
# In both -> version changed or the same
if version1.serialized_data == version2.serialized_data:
#print "same item:", version1
#logger.debug("same item:", version1)
same_items.append(version1)
else:
changed_items.append((version1, version2))
elif version1 is not None and version2 is None:
# In 1 but not in 2 -> removed
#print primary_key, missing_objects_pk2
#print repr(primary_key), repr(missing_objects_pk2)
#logger.debug(primary_key, missing_objects_pk2)
#logger.debug(repr(primary_key), repr(missing_objects_pk2))
if primary_key in missing_objects_dict2:
missing_object = missing_objects_dict2[primary_key]
added_missing_objects.remove(missing_object)
Expand All @@ -337,7 +339,7 @@ def get_m2m_change_info(self):
removed_items.append(version1)
elif version1 is None and version2 is not None:
# In 2 but not in 1 -> added
#print "added:", version2
#logger.debug("added:", version2)
added_items.append(version2)
else:
raise RuntimeError()
Expand All @@ -357,37 +359,37 @@ def get_m2m_change_info(self):
def debug(self):
if not settings.DEBUG:
return
print "_______________________________"
print " *** CompareObjects debug: ***"
print "changed:", self.changed()
print "follow:", self.follow
logger.debug("_______________________________")
logger.debug(" *** CompareObjects debug: ***")
logger.debug("changed:", self.changed())
logger.debug("follow:", self.follow)

This comment has been minimized.

Sign in to view

Copy link
@mlavin

mlavin Jun 19, 2012

These aren't valid logging statements. They translate to "changed:" % self.changed() which raises a TypeError when the message is constructed.

This comment has been minimized.

Sign in to view

Copy link
@bmihelac

bmihelac Jun 20, 2012

Author Contributor

You are right, thanks.

Fixed in #8.

debug1 = self.compare_obj1.get_debug()
debug2 = self.compare_obj2.get_debug()
debug_set1 = set(debug1)
debug_set2 = set(debug2)

print " *** same attributes/values in obj1 and obj2: ***"
logger.debug(" *** same attributes/values in obj1 and obj2: ***")
intersection = debug_set1.intersection(debug_set2)
for item in debug1:
if item in intersection:
print item
logger.debug(item)

print " -" * 40
print " *** unique attributes/values from obj1: ***"
logger.debug(" -" * 40)
logger.debug(" *** unique attributes/values from obj1: ***")
difference = debug_set1.difference(debug_set2)
for item in debug1:
if item in difference:
print item
logger.debug(item)

print " -" * 40
print " *** unique attributes/values from obj2: ***"
logger.debug(" -" * 40)
logger.debug(" *** unique attributes/values from obj2: ***")
difference = debug_set2.difference(debug_set1)
for item in debug2:
if item in difference:
print item
logger.debug(item)

print "-"*79
logger.debug("-"*79)


class BaseCompareVersionAdmin(VersionAdmin):
Expand Down Expand Up @@ -520,7 +522,7 @@ def _get_compare(self, obj_compare):
"""
def _get_compare_func(suffix):
func_name = "compare_%s" % suffix
# print "func_name:", func_name
# logger.debug("func_name:", func_name)
if hasattr(self, func_name):
func = getattr(self, func_name)
return func
Expand Down Expand Up @@ -561,7 +563,7 @@ def compare(self, obj, version1, version2):
has_unfollowed_fields = False

for field in fields:
#print field, field.db_type, field.get_internal_type()
#logger.debug(field, field.db_type, field.get_internal_type())

field_name = field.name

Expand Down

0 comments on commit 7b05baf

Please sign in to comment.