From 8e20f5d1b5949453bd71d332198b5266184bc2a4 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 5 Nov 2011 21:17:09 +0000 Subject: [PATCH] Use strings not unicode in data handler module * lib/mudpy/data.py: Python 3000 treats strings as unicode by default, so we should too. --- lib/mudpy/data.py | 140 +++++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/lib/mudpy/data.py b/lib/mudpy/data.py index 3ed5e0f..243a28b 100644 --- a/lib/mudpy/data.py +++ b/lib/mudpy/data.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -u"""Data interface functions for the mudpy engine.""" +"""Data interface functions for the mudpy engine.""" # Copyright (c) 2004-2011 Jeremy Stanley . Permission # to use, copy, modify, and distribute this software is granted under @@ -8,7 +8,7 @@ u"""Data interface functions for the mudpy engine.""" class DataFile: - u"""A file containing universe elements.""" + """A file containing universe elements.""" def __init__(self, filename, universe): self.filename = filename @@ -16,7 +16,7 @@ class DataFile: self.load() def load(self): - u"""Read a file and create elements accordingly.""" + """Read a file and create elements accordingly.""" import ConfigParser import misc import os @@ -25,13 +25,13 @@ class DataFile: self.modified = False if os.access(self.filename, os.R_OK): self.data.read(self.filename) - if not hasattr(self.universe, u"files"): + if not hasattr(self.universe, "files"): self.universe.files = {} self.universe.files[self.filename] = self includes = [] - if self.data.has_option(u"__control__", u"include_files"): + if self.data.has_option("__control__", "include_files"): for included in makelist( - self.data.get(u"__control__", u"include_files") + self.data.get("__control__", "include_files") ): included = find_file( included, @@ -40,10 +40,10 @@ class DataFile: ) if included not in includes: includes.append(included) - if self.data.has_option(u"__control__", u"include_dirs"): + if self.data.has_option("__control__", "include_dirs"): for included in [ - os.path.join(x, u"__init__.mpy") for x in makelist( - self.data.get(u"__control__", u"include_dirs") + os.path.join(x, "__init__.mpy") for x in makelist( + self.data.get("__control__", "include_dirs") ) ]: included = find_file( @@ -53,9 +53,9 @@ class DataFile: ) if included not in includes: includes.append(included) - if self.data.has_option(u"__control__", u"default_files"): + if self.data.has_option("__control__", "default_files"): origins = makedict( - self.data.get(u"__control__", u"default_files") + self.data.get("__control__", "default_files") ) for key in origins.keys(): origins[key] = find_file( @@ -68,9 +68,9 @@ class DataFile: self.universe.default_origins[key] = origins[key] if key not in self.universe.categories: self.universe.categories[key] = {} - if self.data.has_option(u"__control__", u"private_files"): + if self.data.has_option("__control__", "private_files"): for item in makelist( - self.data.get(u"__control__", u"private_files") + self.data.get("__control__", "private_files") ): item = find_file( item, @@ -82,7 +82,7 @@ class DataFile: if item not in self.universe.private_files: self.universe.private_files.append(item) for section in self.data.sections(): - if section != u"__control__": + if section != "__control__": misc.Element(section, self.universe, self.filename) for include_file in includes: if not os.path.isabs(include_file): @@ -96,7 +96,7 @@ class DataFile: DataFile(include_file, self.universe) def save(self): - u"""Write the data, if necessary.""" + """Write the data, if necessary.""" import codecs import os import os.path @@ -113,40 +113,40 @@ class DataFile: os.makedirs(os.path.dirname(self.filename)) # backup the file - if self.data.has_option(u"__control__", u"backup_count"): + if self.data.has_option("__control__", "backup_count"): max_count = self.data.has_option( - u"__control__", u"backup_count") + "__control__", "backup_count") else: max_count = self.universe.categories[ - u"internal" + "internal" ][ - u"limits" - ].getint(u"default_backup_count") + "limits" + ].getint("default_backup_count") if os.path.exists(self.filename) and max_count: backups = [] for candidate in os.listdir(os.path.dirname(self.filename)): if re.match( os.path.basename(self.filename) + - u"""\.\d+$""", candidate + """\.\d+$""", candidate ): - backups.append(int(candidate.split(u".")[-1])) + backups.append(int(candidate.split(".")[-1])) backups.sort() backups.reverse() for old_backup in backups: if old_backup >= max_count - 1: - os.remove(self.filename + u"." + unicode(old_backup)) + os.remove(self.filename + "." + old_backup) elif not os.path.exists( - self.filename + u"." + unicode(old_backup + 1) + self.filename + "." + old_backup + 1 ): os.rename( - self.filename + u"." + unicode(old_backup), - self.filename + u"." + unicode(old_backup + 1) + self.filename + "." + old_backup, + self.filename + "." + old_backup + 1 ) - if not os.path.exists(self.filename + u".0"): - os.rename(self.filename, self.filename + u".0") + if not os.path.exists(self.filename + ".0"): + os.rename(self.filename, self.filename + ".0") # our data file - file_descriptor = codecs.open(self.filename, u"w", u"utf-8") + file_descriptor = codecs.open(self.filename, "w", "utf-8") # if it's marked private, chmod it appropriately if self.filename in self.universe.private_files and oct( @@ -158,15 +158,15 @@ class DataFile: sections = self.data.sections() sections.sort() for section in sections: - file_descriptor.write(u"[" + section + u"]\n") + file_descriptor.write("[" + section + "]\n") options = self.data.options(section) options.sort() for option in options: file_descriptor.write( - option + u" = " + - self.data.get(section, option) + u"\n" + option + " = " + + self.data.get(section, option) + "\n" ) - file_descriptor.write(u"\n") + file_descriptor.write("\n") # flush and close the file file_descriptor.flush() @@ -176,11 +176,11 @@ class DataFile: self.modified = False def is_writeable(self): - u"""Returns True if the __control__ read_only is False.""" + """Returns True if the __control__ read_only is False.""" return not self.data.has_option( - u"__control__", u"read_only" + "__control__", "read_only" ) or not self.data.getboolean( - u"__control__", u"read_only" + "__control__", "read_only" ) @@ -192,14 +192,14 @@ def find_file( relative=None, universe=None ): - u"""Return an absolute file path based on configuration.""" + """Return an absolute file path based on configuration.""" import os import os.path import sys # make sure to get rid of any surrounding quotes first thing if file_name: - file_name = file_name.strip(u"\"'") + file_name = file_name.strip("\"'") # this is all unnecessary if it's already absolute if file_name and os.path.isabs(file_name): @@ -207,57 +207,57 @@ def find_file( # when no file name is specified, look for .conf elif not file_name: - file_name = os.path.basename(sys.argv[0]) + u".conf" + file_name = os.path.basename(sys.argv[0]) + ".conf" # if a universe was provided, try to get some defaults from there if universe: if hasattr( universe, - u"contents" - ) and u"internal:storage" in universe.contents: - storage = universe.categories[u"internal"][u"storage"] + "contents" + ) and "internal:storage" in universe.contents: + storage = universe.categories["internal"]["storage"] if not root_path: - root_path = storage.get(u"root_path").strip("\"'") + root_path = storage.get("root_path").strip("\"'") if not search_path: - search_path = storage.getlist(u"search_path") + search_path = storage.getlist("search_path") if not default_dir: - default_dir = storage.get(u"default_dir").strip("\"'") + default_dir = storage.get("default_dir").strip("\"'") # if there's only one file loaded, try to work around a chicken 0: - return eval(u"{" + value + u"}") + elif value.find(":") > 0: + return eval("{" + value + "}") else: return {value: None} -- 2.11.0