Merge branch 'comments'

[zzz-floof.git] / floof / model / art.py

diff --git a/floof/model/art.py b/floof/model/art.py
index 451383b..0732684 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -23,16 +23,6 @@ class Art(Entity):
     tags = OneToMany('Tag')
     discussion = ManyToOne('Discussion')
 
     tags = OneToMany('Tag')
     discussion = ManyToOne('Discussion')
 

-    # def __init__(self, **kwargs):
-    #     # I wanted to check for the existence of the file, but...
-    #     # for some reason this FieldStorage object always conditions as falsey.
-    #     # self.hash = save_file("art", kwargs.pop('file'))
-    #     super(Art, self).__init__(**kwargs)
-    #     # this is what super is doing, pretty much.
-    #     # for key, value in kwargs.items():
-    #     #     setattr(self, key, value)
-    # left for posterity.
-

     def set_file(self, file):
         self.hash = save_file("art", file)
         self.original_filename = file.filename
     def set_file(self, file):
         self.hash = save_file("art", file)
         self.original_filename = file.filename


@@ -85,15 +75,6 @@ class Tag(Entity):
     tagger = ManyToOne('User', ondelete='cascade')
     tagtext = ManyToOne('TagText')
 
     tagger = ManyToOne('User', ondelete='cascade')
     tagtext = ManyToOne('TagText')
 

-    # this text setter is no longer useful since I changed the way Art#add_tags works
-    # but I'll leave it in here just for several minutes nostalgia.
-    # def set_text(self, text):
-    #     self.tagtext = TagText.get_by(text=text)
-    #     if not self.tagtext:
-    #         self.tagtext = TagText(text=text)
-    #
-    # text = property(lambda self: self.tagtext.text, set_text)
-

     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"
     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"


@@ -113,12 +94,8 @@ class Rating(Entity):
     rater = ManyToOne('User', ondelete='cascade')
     score = Field(Integer)
 
     rater = ManyToOne('User', ondelete='cascade')
     score = Field(Integer)
 

-    # @score.setter
-    # def score(self, value):
-

     options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
     default = 0
     options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
     default = 0

-    # options = ["sucks","neutral","good","great"]

 
 
 Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))
 
 
 Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))