From 7767a7d9c145658412e0e324b669e1cc53b71ba8 Mon Sep 17 00:00:00 2001 From: Michael Schwarz Date: Mon, 25 Aug 2014 22:00:28 +0200 Subject: [PATCH] list.py: Renamed list module to lists to avoid conflict with builtin. --- src/{list.py => lists.py} | 0 src/ponysay.py | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/{list.py => lists.py} (100%) diff --git a/src/list.py b/src/lists.py similarity index 100% rename from src/list.py rename to src/lists.py diff --git a/src/ponysay.py b/src/ponysay.py index e191ef9f..f9560f5b 100755 --- a/src/ponysay.py +++ b/src/ponysay.py @@ -35,7 +35,7 @@ from balloon import * from spellocorrecter import * from ucs import * from kms import * -import list as _list +import lists from metadata import * @@ -739,7 +739,7 @@ class Ponysay(): @param ponydirs:itr? The pony directories to use ''' - _list.simplelist(self.ponydirs if ponydirs is None else ponydirs, + lists.simplelist(self.ponydirs if ponydirs is None else ponydirs, self.__quoters(), lambda x : self.__ucsise(x)) @@ -749,7 +749,7 @@ class Ponysay(): @param ponydirs:itr The pony directories to use ''' - _list.linklist(self.ponydirs if ponydirs is None else ponydirs, + lists.linklist(self.ponydirs if ponydirs is None else ponydirs, self.__quoters(), lambda x, y : self.__ucsise(x, y)) @@ -760,7 +760,7 @@ class Ponysay(): @param standard:bool Include standard ponies @param extra:bool Include extra ponies ''' - _list.onelist(self.ponydirs if standard else None, + lists.onelist(self.ponydirs if standard else None, self.extraponydirs if extra else None, lambda x : self.__ucsise(x)) @@ -801,7 +801,7 @@ class Ponysay(): ''' Prints a list of all balloons ''' - _list.balloonlist(self.balloondirs, self.isthink) + lists.balloonlist(self.balloondirs, self.isthink) def __getBalloonPath(self, names, alt = False):