Nueva revisión Py3

7 files changed, 16 insertions, 16 deletions

diff --git a/cgi/templates/bans_geo b/cgi/templates/bans_geo
index 64687e8..ba7959a 100644
--- a/cgi/templates/bans_geo
+++ b/cgi/templates/bans_geo
@@ -4,7 +4,7 @@ geo $bans_global {
     #{ip} 1;
 <?py #endfor ?>
 }
-<?py for board, bans in board_bans.iteritems(): ?>
+<?py for board, bans in board_bans.items(): ?>
 geo $bans_#{board} {
     default 0;
     <?py for ip in bans: ?>
diff --git a/cgi/templates/bans_locations b/cgi/templates/bans_locations
index a514ccf..87ac1b7 100644
--- a/cgi/templates/bans_locations
+++ b/cgi/templates/bans_locations
@@ -4,7 +4,7 @@ location /#{board}/ {
     if ($bans_global) { rewrite ^ /cgi/banned; }
     <?py #endif ?>
     <?py if board in board_bans: ?>
-    if ($bans_#{board}) { rewrite ^ /cgi/banned; }
+    if ($bans_#{board}) { rewrite ^ /cgi/banned/#{board}; }
     <?py #endif ?>
 }
 <?py #endfor ?>
diff --git a/cgi/templates/manage/boardoptions.html b/cgi/templates/manage/boardoptions.html
index fcd3bb8..4e33e5b 100644
--- a/cgi/templates/manage/boardoptions.html
+++ b/cgi/templates/manage/boardoptions.html
@@ -174,7 +174,7 @@
 </tr>
 <tr>
 <td class="postblock">Archivar hilos</td>
-<td><input type="checkbox" name="archive" id="arch" value="1"#{checked(boardopts['archive'] == '1')} /><label for="arch"></label></td>
+<td><input type="checkbox" name="archive" id="arch" value="1"#{checked(boardopts['archive'])} /><label for="arch"></label></td>
 </tr>
 <tr>
 <td class="postblock">Espera para crear nuevo hilo</td>
diff --git a/cgi/templates/mobile/txt_thread.html b/cgi/templates/mobile/txt_thread.html
index c9b58a8..3df16fc 100644
--- a/cgi/templates/mobile/txt_thread.html
+++ b/cgi/templates/mobile/txt_thread.html
@@ -11,7 +11,7 @@
 <?py if thread['length'] > 50: ?>
   <a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}/-50" rel="nofollow">Primeros 50</a>
 <?py #endif ?>
-<?py r = range(thread['length'] / 50) ?>
+<?py r = range(thread['length'] // 50) ?>
 <?py for i in r[:-1]: ?>
   <a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}/#{(i+1)*50+1}-#{(i+2)*50}" rel="nofollow">#{(i+1)*50+1}-#{(i+2)*50}</a>
 <?py #endfor ?>
@@ -29,9 +29,9 @@
 <div id="thread">
 <h1>#{thread['subject']} <span>(#{thread['length']})</span></h1>
 <?py for post in thread['posts']: ?>
-<?py if post['IS_DELETED'] == '1': ?>
+<?py if post['IS_DELETED'] == 1: ?>
 <div class="pst"><h3 class="del"><a href="#" class="num">#{str(post['num']).zfill(4)}</a> Eliminado por el usuario.</h3></div>
-<?py elif post['IS_DELETED'] == '2': ?>
+<?py elif post['IS_DELETED'] == 2: ?>
 <div class="pst"><h3 class="del"><a href="#" class="num">#{str(post['num']).zfill(4)}</a> Eliminado por miembro del staff.</h3></div>
 <?py else: ?>
 <div id="p#{post['id']}" class="pst">
@@ -42,7 +42,7 @@
 </div>
 <?py #endif ?>
 <?py #endfor ?>
-<?py if thread['locked'] != '1': ?>
+<?py if not thread['locked']: ?>
 <a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}/#{thread['length']}-n" id="n">Ver nuevos posts</a><span id="n2"></span>
 <?py #endif ?>
 <div class="nav">
@@ -51,7 +51,7 @@
   <div><a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}">Hilo completo</a><a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}/-50">Primeros 50</a><a href="#{cgi_url}mobileread/#{board}/#{thread['timestamp']}/l10">Últimos 25</a></div>
   <?py #endif ?>
 </div>
-<?py if thread['locked'] != '1': ?>
+<?py if not thread['locked']: ?>
   <form name="postform" id="postform" action="/cgi/post" method="post" enctype="multipart/form-data">
   <input type="hidden" name="board" value="#{board}" /><input type="hidden" name="parent" value="#{thread['id']}" /><input type="hidden" name="mobile" value="true" /><input type="hidden" name="password" value="" />
   <div style="display:none"><input type="text" name="name" /><input type="text" name="email" /></div>
diff --git a/cgi/templates/revision.html b/cgi/templates/revision.html
index 78bc1ab..9028ec6 100644
--- a/cgi/templates/revision.html
+++ b/cgi/templates/revision.html
@@ -1 +1 @@
-0.10.0
+0.10.5
diff --git a/cgi/templates/txt_archive.html b/cgi/templates/txt_archive.html
index 88b3196..1407fcf 100644
--- a/cgi/templates/txt_archive.html
+++ b/cgi/templates/txt_archive.html
@@ -43,9 +43,9 @@
 <div class="thread" data-length="#{thread['length']}">
   <h3>#{thread['subject']} <span>(${(str(thread['length'])+" respuestas") if thread['length'] > 1 else "Una respuesta"})</span></h3>
   <?py for post in thread['posts']: ?>
-    <?py if post['IS_DELETED'] == '1': ?>
+    <?py if post['IS_DELETED'] == 1: ?>
     <div class="reply deleted" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por usuario.</h4></div>
-    <?py elif post['IS_DELETED'] == '2': ?>
+    <?py elif post['IS_DELETED'] == 2: ?>
     <div class="reply deleted" data-n="#{post['num']}"><h4>#{post['num']} : Mensaje eliminado por staff.</h4></div>
     <?py else: ?>
     <div class="reply#{' first' if post['num'] == 1 else ''}" data-n="#{post['num']}">
diff --git a/cgi/templates/txt_thread.en.html b/cgi/templates/txt_thread.en.html
index 4b16fca..c8348a1 100644
--- a/cgi/templates/txt_thread.en.html
+++ b/cgi/templates/txt_thread.en.html
@@ -9,7 +9,7 @@
   <?py if thread['length'] > 100: ?>
     <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/1-100">First 100</a>
   <?py #endif ?>
-  <?py for i in range(thread['length'] / 100): ?>
+  <?py for i in range(thread['length'] // 100): ?>
     <a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{(i+1)*100+1}-#{(i+2)*100}">#{(i+1)*100+1}-</a>
   <?py #endfor ?>
   <?py if thread['length'] > 51: ?>
@@ -28,9 +28,9 @@
 <div class="thread" data-length="#{thread['length']}">
   <h3>#{thread['subject']} <span>(${(str(thread['length'])+" replies") if thread['length']>1 else "1 reply"})</span></h3>
   <?py for post in thread['posts']: ?>
-  <?py if post['IS_DELETED'] == '1': ?>
+  <?py if post['IS_DELETED'] == 1: ?>
     <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by user.</h4></div>
-  <?py elif post['IS_DELETED'] == '2': ?>
+  <?py elif post['IS_DELETED'] == 2: ?>
     <div class="reply deleted" id="p#{post['id']}" data-n="#{post['num']}"><h4>#{post['num']} : Post deleted by staff.</h4></div>
   <?py else: ?>
     <div class="reply#{' first' if post['num'] == 1 else ''}" id="p#{post['id']}" data-n="#{post['num']}">
@@ -61,7 +61,7 @@
   <div id="size">#{thread['size']}</div>
 </div>
 <hr />
-<?py if thread['locked'] != '1': ?>
+<?py if not thread['locked']: ?>
   <div class="lastposts"><a href="#{boards_url}#{board}/read/#{thread['timestamp']}/#{thread['length']}-n" id="n">Show new posts</a></div>
   <hr />
 <?py #endif ?>
@@ -105,4 +105,4 @@
 <div class="end">weabot.py ver <?py include('templates/revision.html') ?> Bienvenido a Internet BBS/IB</div>
 <a name="bottom"></a>
 </body>
-</html>
\ No newline at end of file
+</html>