Rename Photo.tags -> get_tags.

etiquette/jsonify.py

@@ -36,7 +36,7 @@ def exception(e):
     return j
 
 def photo(p, include_albums=True, include_tags=True):
-    tags = p.tags()
+    tags = p.get_tags()
     tags.sort(key=lambda x: x.name)
     j = {
         'id': p.id,

etiquette/objects.py

@@ -664,7 +664,7 @@ class Photo(ObjectBase):
         '''
         Take all of the tags owned by other_photo and apply them to this photo.
         '''
-        for tag in other_photo.tags():
+        for tag in other_photo.get_tags():
             self.add_tag(tag)
 
     @decorators.required_feature('photo.edit')
@@ -792,6 +792,18 @@ class Photo(ObjectBase):
         self.__reinit__()
         return self.thumbnail
 
+    def get_tags(self):
+        '''
+        Return the tags assigned to this Photo.
+        '''
+        generator = helpers.select_generator(
+            self.photodb.sql,
+            'SELECT tagid FROM photo_tag_rel WHERE photoid == ?',
+            [self.id]
+        )
+        tags = [self.photodb.get_tag(id=fetch[0]) for fetch in generator]
+        return tags
+
     def has_tag(self, tag, *, check_children=True):
         '''
         Return the Tag object if this photo contains that tag.
@@ -1024,22 +1036,10 @@ class Photo(ObjectBase):
         self.__reinit__()
 
     def sorted_tags(self):
-        tags = self.tags()
+        tags = self.get_tags()
         tags.sort(key=lambda x: x.qualified_name())
         return tags
 
-    def tags(self):
-        '''
-        Return the tags assigned to this Photo.
-        '''
-        generator = helpers.select_generator(
-            self.photodb.sql,
-            'SELECT tagid FROM photo_tag_rel WHERE photoid == ?',
-            [self.id]
-        )
-        tags = [self.photodb.get_tag(id=fetch[0]) for fetch in generator]
-        return tags
-
 
 class Tag(ObjectBase, GroupableMixin):
     '''

etiquette/photodb.py

@@ -634,7 +634,7 @@ class PDBPhotoMixin:
                 continue
 
             if (has_tags is not None) or is_tagsearch:
-                photo_tags = set(photo.tags())
+                photo_tags = set(photo.get_tags())
 
                 if has_tags is False and len(photo_tags) > 0:
                     continue

frontends/etiquette_flask/etiquette_flask/endpoints/photo_endpoints.py

@@ -211,7 +211,7 @@ def get_search_core():
     # TAGS ON THIS PAGE
     total_tags = set()
     for photo in photos:
-        for tag in photo.tags():
+        for tag in photo.get_tags():
             total_tags.add(tag)
     total_tags = sorted(total_tags, key=lambda t: t.qualified_name())
 

frontends/etiquette_flask/templates/photo_card.html

@@ -37,7 +37,7 @@
 {% endif %}
 
 {% set tag_names_title = [] %}
-{% for tag in photo.tags() %}
+{% for tag in photo.get_tags() %}
     {% do tag_names_title.append(tag.name) %}
 {% endfor %}
 

frontends/etiquette_repl/etiquette_repl_launch.py

@@ -30,7 +30,7 @@ def easytagger():
 
 def photag(photo_id):
     photo = P.get_photo_by_id(photo_id)
-    print(photo.tags())
+    print(photo.get_tags())
     while True:
         photo.add_tag(input('> '))
 get = P.get_tag