diff options
Diffstat (limited to 'avahi-python')
| -rw-r--r-- | avahi-python/Makefile.in | 37 | ||||
| -rw-r--r-- | avahi-python/avahi-discover/Makefile.in | 61 | ||||
| -rw-r--r-- | avahi-python/avahi/Makefile.am | 7 | ||||
| -rw-r--r-- | avahi-python/avahi/Makefile.in | 62 | ||||
| -rw-r--r-- | avahi-python/avahi/ServiceTypeDatabase.py.in | 16 |
5 files changed, 103 insertions, 80 deletions
diff --git a/avahi-python/Makefile.in b/avahi-python/Makefile.in index e9e3516..2d7f13b 100644 --- a/avahi-python/Makefile.in +++ b/avahi-python/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,13 +94,19 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -465,9 +471,7 @@ uninstall-binSCRIPTS: @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -686,10 +690,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/avahi-python/avahi-discover/Makefile.in b/avahi-python/avahi-discover/Makefile.in index 6a8eb34..701fb47 100644 --- a/avahi-python/avahi-discover/Makefile.in +++ b/avahi-python/avahi-discover/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -106,18 +106,25 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(avahi_discoverdir)" "$(DESTDIR)$(desktopdir)" SCRIPTS = $(bin_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = am__avahi_discover_PYTHON_DIST = __init__.py +am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) py_compile = $(top_srcdir)/py-compile DATA = $(desktop_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -445,9 +452,7 @@ uninstall-binSCRIPTS: @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -472,11 +477,8 @@ install-avahi_discoverPYTHON: $(avahi_discover_PYTHON) $(INSTALL_DATA) $$files "$(DESTDIR)$(avahi_discoverdir)" || exit $$?; \ done || exit $$?; \ if test -n "$$dlist"; then \ - if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(avahi_discoverdir)" $$dlist; \ - else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(avahi_discoverdir)" $$dlist; \ - fi; \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(avahi_discoverdir)" $$dlist; \ else :; fi uninstall-avahi_discoverPYTHON: @@ -484,14 +486,14 @@ uninstall-avahi_discoverPYTHON: @list='$(avahi_discover_PYTHON)'; test -n "$(avahi_discoverdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ + dir='$(DESTDIR)$(avahi_discoverdir)'; \ filesc=`echo "$$files" | sed 's|$$|c|'`; \ fileso=`echo "$$files" | sed 's|$$|o|'`; \ - echo " ( cd '$(DESTDIR)$(avahi_discoverdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(avahi_discoverdir)" && rm -f $$files || exit $$?; \ - echo " ( cd '$(DESTDIR)$(avahi_discoverdir)' && rm -f" $$filesc ")"; \ - cd "$(DESTDIR)$(avahi_discoverdir)" && rm -f $$filesc || exit $$?; \ - echo " ( cd '$(DESTDIR)$(avahi_discoverdir)' && rm -f" $$fileso ")"; \ - cd "$(DESTDIR)$(avahi_discoverdir)" && rm -f $$fileso + st=0; \ + for files in "$$files" "$$filesc" "$$fileso"; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @@ -509,9 +511,7 @@ uninstall-desktopDATA: @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -566,10 +566,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am index 907c5eb..3eb67d0 100644 --- a/avahi-python/avahi/Makefile.am +++ b/avahi-python/avahi/Makefile.am @@ -17,11 +17,12 @@ EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in +pkglibdatadir=$(libdir)/avahi + if HAVE_PYTHON avahidir = $(pythondir)/avahi - if HAVE_GDBM nodist_avahi_SCRIPTS = ServiceTypeDatabase.py @@ -31,7 +32,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ -e 's,@CHECK_KEY\@,while key is not None:,g' \ -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ - -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ + -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ chmod +x $@ endif @@ -44,7 +45,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ -e 's,@CHECK_KEY\@,for key in keys:,g' \ -e 's,@NEXT_KEY\@,,g' \ - -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ + -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ chmod +x $@ endif diff --git a/avahi-python/avahi/Makefile.in b/avahi-python/avahi/Makefile.in index ba4b0d8..111b134 100644 --- a/avahi-python/avahi/Makefile.in +++ b/avahi-python/avahi/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -96,17 +96,24 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(avahidir)" "$(DESTDIR)$(avahidir)" SCRIPTS = $(nodist_avahi_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = am__avahi_PYTHON_DIST = __init__.py +am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) py_compile = $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -354,6 +361,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in +pkglibdatadir = $(libdir)/avahi @HAVE_PYTHON_TRUE@avahidir = $(pythondir)/avahi @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@nodist_avahi_SCRIPTS = ServiceTypeDatabase.py @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@nodist_avahi_SCRIPTS = ServiceTypeDatabase.py @@ -423,9 +431,7 @@ uninstall-nodist_avahiSCRIPTS: @list='$(nodist_avahi_SCRIPTS)'; test -n "$(avahidir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(avahidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(avahidir)" && rm -f $$files + dir='$(DESTDIR)$(avahidir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -450,11 +456,8 @@ install-avahiPYTHON: $(avahi_PYTHON) $(INSTALL_DATA) $$files "$(DESTDIR)$(avahidir)" || exit $$?; \ done || exit $$?; \ if test -n "$$dlist"; then \ - if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(avahidir)" $$dlist; \ - else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(avahidir)" $$dlist; \ - fi; \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(avahidir)" $$dlist; \ else :; fi uninstall-avahiPYTHON: @@ -462,14 +465,14 @@ uninstall-avahiPYTHON: @list='$(avahi_PYTHON)'; test -n "$(avahidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ + dir='$(DESTDIR)$(avahidir)'; \ filesc=`echo "$$files" | sed 's|$$|c|'`; \ fileso=`echo "$$files" | sed 's|$$|o|'`; \ - echo " ( cd '$(DESTDIR)$(avahidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(avahidir)" && rm -f $$files || exit $$?; \ - echo " ( cd '$(DESTDIR)$(avahidir)' && rm -f" $$filesc ")"; \ - cd "$(DESTDIR)$(avahidir)" && rm -f $$filesc || exit $$?; \ - echo " ( cd '$(DESTDIR)$(avahidir)' && rm -f" $$fileso ")"; \ - cd "$(DESTDIR)$(avahidir)" && rm -f $$fileso + st=0; \ + for files in "$$files" "$$filesc" "$$fileso"; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st tags: TAGS TAGS: @@ -524,10 +527,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -628,7 +636,7 @@ uninstall-am: uninstall-avahiPYTHON uninstall-nodist_avahiSCRIPTS @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@CHECK_KEY\@,while key is not None:,g' \ @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ +@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ServiceTypeDatabase.py: ServiceTypeDatabase.py.in @@ -637,7 +645,7 @@ uninstall-am: uninstall-avahiPYTHON uninstall-nodist_avahiSCRIPTS @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@CHECK_KEY\@,for key in keys:,g' \ @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@NEXT_KEY\@,,g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ +@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in index 8ad8d5e..b2035fd 100644 --- a/avahi-python/avahi/ServiceTypeDatabase.py.in +++ b/avahi-python/avahi/ServiceTypeDatabase.py.in @@ -26,7 +26,7 @@ locale.setlocale(locale.LC_ALL, '') class ServiceTypeDatabase: """ServiceTypeDatabase maps service types to descriptions""" - def __init__(self, filename = "@pkglibdir@/service-types.db"): + def __init__(self, filename = "@pkglibdatadir@/service-types.db"): self.db = @DBM@.open(filename, "r") @@ -46,13 +46,13 @@ class ServiceTypeDatabase: if i >= 0: k = l[0][:i] - + if not l[1] is None: self.suffixes += (k + "@" + l[1], ) self.suffixes += (k, ) - - + + self.suffixes = tuple(map(lambda x: "["+x+"]", self.suffixes)) + ("", ) def __getitem__(self, key): @@ -75,7 +75,7 @@ class ServiceTypeDatabase: if self.db.has_key(key + suffix): return True - + return False def __contains__(self, item): @@ -86,7 +86,7 @@ class ServiceTypeDatabase: return True return False - + def __iter__(self): @@ -134,9 +134,9 @@ class ServiceTypeDatabase: def values(self): return list(self.itervalues()) - + if __name__ == "__main__": - + b = ServiceTypeDatabase() print b.items() |