remove singleton function from table accessor

[amulettoolsmh4/main.git] / model / skilltable.py

diff --git a/model/skilltable.py b/model/skilltable.py
index c3122ff..56abb0d 100644 (file)
--- a/model/skilltable.py
+++ b/model/skilltable.py
@@ -8,7 +8,7 @@ u"""
 import sqlite3
 import csv
 
-import singleton
+#import singleton
 
 # for skill table
 NAME = u"skill_table"
@@ -60,7 +60,7 @@ class SkillTableGenerator(object):
 
 class SkillTableAccessor(object):
     u""" スキルIDとスキル名の組み合わせテーブルへのアクセス用クラス """
-    __metaclass__ = singleton.Singleton
+    #__metaclass__ = singleton.Singleton
     def __init__(self, db_cursor):
         u""" db_cursor: cursor of sqlite3 database """
         self._cursor = db_cursor
@@ -73,6 +73,8 @@ class SkillTableAccessor(object):
         id2name_dict, name2id_dict = {}, {}
         for row in self._cursor.fetchall(): #(id, name)
             skill_id, skill_name = row[0], row[1]
+            #if not isinstance(skill_name, unicode):
+            #    skill_name = unicode(skill_name, u"utf-8")
             id2name_dict[skill_id] = skill_name
             name2id_dict[skill_name] = skill_id