← Back to branch summary

~vorlon/ubuntu/saucy/gourmet/trunk

~vorlon/ubuntu/saucy/gourmet/trunk

« back to all changes in this revision

Viewing changes to src/lib/shopping.py

Committer: Bazaar Package Importer
Author(s): Rolf Leggewie
Date: 2009-02-10 17:34:51 UTC
mfrom: (2.1.4 squeeze)
Revision ID: james.westby@ubuntu.com-20090210173451-bt0a6j0ut71oxqes

Tags: 0.14.5-1

* new upstream release
* 0.14.5 no longer conflicts with newer versions of python-pysqlite and
  python-sqlalchemy.  Relax dependencies accordingly.
* all patches have been pushed upstream, so they can be dropped in Debian.
  The manpage was forgotten when preparing the tarball upstream, so it
  will stick around for another release.

files added:
images/recbox.ico

images/recbox_biggish.ico

images/reccard.ico

images/reccard.png

images/reccard_edit.png

src/lib/plugins/browse_plugin.gourmet-plugin

src/lib/plugins/browse_plugin.gourmet-plugin.in

src/lib/plugins/browse_recipes

src/lib/plugins/browse_recipes/__init__.py

src/lib/plugins/browse_recipes/browser.py

src/lib/plugins/browse_recipes/icon_helpers.py

src/lib/plugins/browse_recipes/images

src/lib/plugins/browse_recipes/images/__init__.py

src/lib/plugins/browse_recipes/images/cooktime.png

src/lib/plugins/browse_recipes/images/cooktime_empty_clock.png

src/lib/plugins/browse_recipes/images/cuisine.png

src/lib/plugins/browse_recipes/images/generic_category.png

src/lib/plugins/browse_recipes/images/generic_recipe.png

src/lib/plugins/browse_recipes/images/preptime.png

src/lib/plugins/browse_recipes/images/preptime_empty_clock.png

src/lib/plugins/browse_recipes/images/rating.png

src/lib/plugins/browse_recipes/images/source.png

src/lib/plugins/email.gourmet-plugin

src/lib/plugins/email.gourmet-plugin.in

src/lib/plugins/email_plugin

src/lib/plugins/email_plugin/__init__.py

src/lib/plugins/email_plugin/emailer.py

src/lib/plugins/email_plugin/emailer_plugin.py

src/lib/plugins/email_plugin/recipe_emailer.py

src/lib/plugins/field_editor

src/lib/plugins/field_editor.gourmet-plugin

src/lib/plugins/field_editor.gourmet-plugin.in

src/lib/plugins/field_editor/__init__.py

src/lib/plugins/field_editor/fieldEditor.py

src/lib/plugins/import_export/plaintext_plugin/plaintext_exporter_plugin.py

src/lib/plugins/nutritional_information/images

src/lib/plugins/nutritional_information/images/Nutrition.png

src/lib/plugins/python_shell

src/lib/plugins/python_shell.gourmet-plugin

src/lib/plugins/python_shell.gourmet-plugin.in

src/lib/plugins/python_shell/__init__.py

src/lib/plugins/python_shell/ipython_view.py

src/lib/plugins/unit_display_prefs

src/lib/plugins/unit_display_prefs.gourmet-plugin

src/lib/plugins/unit_display_prefs.gourmet-plugin.in

src/lib/plugins/unit_display_prefs/__init__.py

src/lib/plugins/unit_display_prefs/unit_prefs_dialog.py

files removed:
debian/patches/01-disable_gtk_check.patch

debian/patches/02-fix_gnome_menu.patch

debian/patches/04-fix-python_version_dependency.patch

src/lib/valueEditor.py

files modified:
ChangeLog

MANIFEST

PKG-INFO

README

TESTS

TODO

debian/changelog

debian/control

debian/copyright

debian/patches/series

glade/shopList.glade

glade/valueEditor.glade

gourmet.desktop.in

setup.py

src/lib/GourmetRecipeManager.py

src/lib/ImageExtras.py

src/lib/backends/db.py

src/lib/batchEditor.py

src/lib/check_encodings.py

src/lib/convert.py

src/lib/defaults/defaults.py

src/lib/defaults/defaults_en.py

src/lib/defaults/defaults_en_GB.py

src/lib/exporters/exportManager.py

src/lib/gdebug.py

src/lib/gglobals.py

src/lib/gtk_extras/LinkedTextView.py

src/lib/gtk_extras/TextBufferMarkup.py

src/lib/gtk_extras/dialog_extras.py

src/lib/gtk_extras/numberEntry.py

src/lib/gtk_extras/timeEntry.py

src/lib/gtk_extras/treeview_extras.py

src/lib/gtk_extras/validatingEntry.py

src/lib/importers/imageBrowser.py

src/lib/importers/importManager.py

src/lib/importers/plaintext_importer.py

src/lib/plugin.py

src/lib/plugin_loader.py

src/lib/plugins/duplicate_finder/__init__.py

src/lib/plugins/duplicate_finder/recipeMerger.glade

src/lib/plugins/duplicate_finder/recipeMerger.py

src/lib/plugins/duplicate_finder/recipeMergerPlugin.py

src/lib/plugins/import_export/gxml_plugin/gxml2_exporter.py

src/lib/plugins/import_export/gxml_plugin/gxml_exporter_plugin.py

src/lib/plugins/import_export/html_plugin/html_exporter_plugin.py

src/lib/plugins/import_export/krecipe_plugin/krecipe_importer_plugin.py

src/lib/plugins/import_export/mealmaster_plugin/mealmaster_exporter_plugin.py

src/lib/plugins/import_export/pdf_plugin/pdf_exporter_plugin.py

src/lib/plugins/import_export/plaintext.gourmet-plugin

src/lib/plugins/import_export/plaintext.gourmet-plugin.in

src/lib/plugins/import_export/plaintext_plugin/__init__.py

src/lib/plugins/import_export/website_import_plugins/about_dot_com_plugin.py

src/lib/plugins/import_export/website_import_plugins/foodnetwork_plugin.py

src/lib/plugins/key_editor/keyEditor.py

src/lib/plugins/key_editor/keyeditor.glade

src/lib/plugins/nutritional_information/main_plugin.py

src/lib/plugins/nutritional_information/parser_data.py

src/lib/plugins/nutritional_information/reccard_plugin.py

src/lib/reccard.py

src/lib/shopgui.py

src/lib/shopping.py

src/lib/threadManager.py

src/lib/timeScanner.py

src/lib/version.py

Show diffs side-by-side

added added

removed removed

src/lib/shopping.py

197

197

"""Put two ingredients in order"""

198

198

inga = inga[0]

199

199

ingb = ingb[0]

200

if self.ingorder_dic.has_key(inga) and self.ingorder_dic.has_key(ingb):

200

if False and self.ingorder_dic.has_key(inga) and self.ingorder_dic.has_key(ingb):

201

201

# if both ings have known positions, we use them to compare

202

202

inga = self.ingorder_dic[inga]

203

203

ingb = self.ingorder_dic[ingb]

Older »