Not redirect when http 302 Found.

[fukui-no-namari/fukui-no-namari.git] / src / Hage1 / subjecttxtfile.py

diff --git a/src/Hage1/subjecttxtfile.py b/src/Hage1/subjecttxtfile.py
index 8f20faf..49b92f3 100644 (file)
--- a/src/Hage1/subjecttxtfile.py
+++ b/src/Hage1/subjecttxtfile.py
@@ -18,9 +18,10 @@
 import re
 import os.path
 import codecs
-import urllib
+import urllib2
 from misc import get_board_subjecttxt_path
 from misc import get_board_idx_path
+from http_sub import HTTPRedirectHandler302
 
 REG_EXPR = re.compile("(?P<id>.*).dat<>(?P<title>.*)\((?P<res>\d*)\)")
 
@@ -52,10 +53,16 @@ def load_subjecttxt(bbs, board, func):
     analyze_subjecttxt(subjecttxt_encoded.decode("cp932", "replace"), func)
 
 def get_subjecttxt(bbs, board, uri):
-    u = urllib.urlopen(uri)
-    subjecttxt_encoded = u.read()
-    info = u.info()
 
+    # get subject.txt
+
+    opener = urllib2.build_opener(HTTPRedirectHandler302)
+    response = opener.open(uri)
+    info = response.info()
+    print info
+    subjecttxt_encoded = response.read()
+
+    # save subject.txt
     subjecttxt_path = get_board_subjecttxt_path(bbs, board)
     
     basedir = os.path.dirname(subjecttxt_path)