Attachment #352766 for bug #449916




import time
import xml.etree.ElementTree as ET

from hcs_utils.storage import Storage, storageify, unstorageify

log = logging.getLogger(__name__)

CACHE_FORMAT_VERSION = '4.0'
G_MAX_SRESULTS = 9999 # Maximum number of entries to ask google for.
GDATA_VERSION = '3'
ATOM_NS = '{http://www.w3.org/2005/Atom}'

                log.info('Failed to read the cache file: %s', err)
                raise
        if cache:
            self.contacts = storageify(cache.get('contacts'))
            self.groups = storageify(cache.get('groups'))
        else:
            self.update()
        if not self.contacts:


        """
        if self.contacts: # never write a empty addressbook
            cache = {'contacts': unstorageify(self.contacts), 'groups': unstorageify(self.groups), 'goobook_cache': CACHE_FORMAT_VERSION}
            pickle.dump(cache, open(self.__config.cache_filename, 'wb'))

    def get_group(self, id_):

Lines 1-6 Link Here

(-)goobook-1.4.old/goobook.egg-info/requires.txt (-2 / +1 lines)
1	argparse>=1.1
2	distribute	1	distribute
3	gdata>=2.0.7	2	gdata>=2.0.7
4	hcs_utils==1.1.1	3	hcs_utils>=1.3
5	simplejson>=2.1.0	4	simplejson>=2.1.0
6	keyring>=0.2	5	keyring>=0.2

Lines 58-67 Link Here

(-)goobook-1.4.old/setup.py (-2 / +1 lines)
58	""".splitlines() if f.strip()],	58	""".splitlines() if f.strip()],
59	license = 'GPLv3',	59	license = 'GPLv3',
60	install_requires = [	60	install_requires = [
61	'argparse>=1.1',
62	'distribute',	61	'distribute',
63	'gdata>=2.0.7',	62	'gdata>=2.0.7',
64	'hcs_utils==1.1.1',	63	'hcs_utils>=1.3',
65	'simplejson>=2.1.0',	64	'simplejson>=2.1.0',
66	'keyring>=0.2'],	65	'keyring>=0.2'],
67	packages = find_packages(),	66	packages = find_packages(),

Return to bug 449916

Lines 37-47 Link Here

(-)goobook-1.4.old/goobook/goobook.py (-5 / +5 lines)
37	import time	37	import time
38	import xml.etree.ElementTree as ET	38	import xml.etree.ElementTree as ET
39		39
40	from hcs_utils.storage import Storage	40	from hcs_utils.storage import Storage, storageify, unstorageify
41		41
42	log = logging.getLogger(__name__)	42	log = logging.getLogger(__name__)
43		43
44	CACHE_FORMAT_VERSION = '3.2'	44	CACHE_FORMAT_VERSION = '4.0'
45	G_MAX_SRESULTS = 9999 # Maximum number of entries to ask google for.	45	G_MAX_SRESULTS = 9999 # Maximum number of entries to ask google for.
46	GDATA_VERSION = '3'	46	GDATA_VERSION = '3'
47	ATOM_NS = '{http://www.w3.org/2005/Atom}'	47	ATOM_NS = '{http://www.w3.org/2005/Atom}'
Lines 243-250 Link Here
243	log.info('Failed to read the cache file: %s', err)	243	log.info('Failed to read the cache file: %s', err)
244	raise	244	raise
245	if cache:	245	if cache:
246	self.contacts = cache.get('contacts')	246	self.contacts = storageify(cache.get('contacts'))
247	self.groups = cache.get('groups')	247	self.groups = storageify(cache.get('groups'))
248	else:	248	else:
249	self.update()	249	self.update()
250	if not self.contacts:	250	if not self.contacts:
Lines 262-268 Link Here
262		262
263	"""	263	"""
264	if self.contacts: # never write a empty addressbook	264	if self.contacts: # never write a empty addressbook
265	cache = {'contacts': self.contacts, 'groups': self.groups, 'goobook_cache': CACHE_FORMAT_VERSION}	265	cache = {'contacts': unstorageify(self.contacts), 'groups': unstorageify(self.groups), 'goobook_cache': CACHE_FORMAT_VERSION}
266	pickle.dump(cache, open(self.__config.cache_filename, 'wb'))	266	pickle.dump(cache, open(self.__config.cache_filename, 'wb'))
267		267
268	def get_group(self, id_):	268	def get_group(self, id_):