Xavier ALT (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/6.1-opw-575797-xal into
lp:openobject-server/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-opw-575797-xal/+merge/128868
Hi,
This fix missing zoneinfo information inside win32 packaging, preventing
correct timezone convertion on windows.
Cheers,
Xavier
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-opw-575797-xal/+merge/128868
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.1-opw-575797-xal.
=== modified file 'setup.py'
--- setup.py 2012-02-07 12:14:11 +0000
+++ setup.py 2012-10-10 07:10:23 +0000
@@ -40,6 +40,20 @@
r = d.items()
if os.name == 'nt':
r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+ # force copy of pytz zoneinfo
+ import pytz
+ # Make sure the layout of pytz hasn't changed
+ assert (pytz.__file__.endswith('__init__.pyc') or
+ pytz.__file__.endswith('__init__.py')), pytz.__file__
+ zoneinfo_dir = os.path.join(os.path.dirname(pytz.__file__), 'zoneinfo')
+
+ # '..\\Lib\\pytz\\__init__.py' -> '..\\Lib'
+ disk_basedir = os.path.dirname(os.path.dirname(pytz.__file__))
+ for absdir, directories, filenames in os.walk(zoneinfo_dir):
+ assert absdir.startswith(disk_basedir), (absdir, disk_basedir)
+ data_dir = absdir[len(disk_basedir+os.sep):]
+ r.append((data_dir,
+ [ os.path.join(absdir, f) for f in filenames ]))
import babel
r.append(("localedata",
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
