From: Eevee Date: Mon, 12 Oct 2009 03:17:32 +0000 (-0700) Subject: Removed some commented-out code. X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/2037ab1d9057d34ccf0457e8fb5c7c34b2d89083?hp=03afe6343d8d8d5547074999b85a7b2d1fe2f428 Removed some commented-out code. --- diff --git a/floof/controllers/art.py b/floof/controllers/art.py index ca1d7dc..fea21c6 100644 --- a/floof/controllers/art.py +++ b/floof/controllers/art.py @@ -20,10 +20,6 @@ class ArtController(BaseController): if id: c.art = h.get_object_or_404(Art, id=id) - # def index(): - # c.artwork = Art.query.order_by(Art.id.desc()).all() - # return render - def new(self): """ New Art! """ return render("/art/new.mako") diff --git a/floof/model/art.py b/floof/model/art.py index 1bde59b..c21c74a 100644 --- a/floof/model/art.py +++ b/floof/model/art.py @@ -21,16 +21,6 @@ class Art(Entity): uploader = ManyToOne('User', required=True) tags = OneToMany('Tag') - # 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 @@ -83,15 +73,6 @@ class Tag(Entity): 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)" @@ -111,12 +92,8 @@ class Rating(Entity): 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 = ["sucks","neutral","good","great"] -Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys())) \ No newline at end of file +Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))