Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Mon, 18 Jul 2011 19:54:53 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 18 Jul 2011 19:54:53 +0200
- branch
- 5_1_x
- changeset 1186
- df2ec39bb002
- parent 1185
- d47de1d09f7c (diff)
- parent 1182
- 86d320b21279 (current diff)
- child 1187
- 0a1dc25d1881
Merged remote changes.
--- a/install.py Sun Jul 17 18:26:48 2011 +0200 +++ b/install.py Mon Jul 18 19:54:53 2011 +0200 @@ -313,11 +313,15 @@ e5cfile = os.path.join(pyModDir, name) if os.path.exists(e5cfile): os.remove(e5cfile) + e5cfile = os.path.join(pyModDir, "__pycache__", name) + path, ext = os.path.splitext(e5cfile) + for f in glob.glob("{0}.*{1}".format(path, ext)): + os.remove(f) # Cleanup the install directories for name in ['ericExamplesDir', 'ericDocDir', 'ericDTDDir', 'ericCSSDir', - 'ericIconDir', 'ericPixDir', 'ericDir', 'ericTemplatesDir', - 'ericCodeTemplatesDir', 'ericOthersDir', 'ericStylesDir']: + 'ericIconDir', 'ericPixDir', 'ericTemplatesDir', 'ericCodeTemplatesDir', + 'ericOthersDir', 'ericStylesDir', 'ericDir']: if os.path.exists(getConfig(name)): shutil.rmtree(getConfig(name), True)
--- a/uninstall.py Sun Jul 17 18:26:48 2011 +0200 +++ b/uninstall.py Mon Jul 18 19:54:53 2011 +0200 @@ -102,11 +102,15 @@ e5cfile = os.path.join(pyModDir, name) if os.path.exists(e5cfile): os.remove(e5cfile) + e5cfile = os.path.join(pyModDir, "__pycache__", name) + path, ext = os.path.splitext(e5cfile) + for f in glob.glob("{0}.*{1}".format(path, ext)): + os.remove(f) # Cleanup the install directories for name in ['ericExamplesDir', 'ericDocDir', 'ericDTDDir', 'ericCSSDir', - 'ericIconDir', 'ericPixDir', 'ericDir', 'ericTemplatesDir', - 'ericCodeTemplatesDir', 'ericOthersDir', 'ericStylesDir']: + 'ericIconDir', 'ericPixDir', 'ericTemplatesDir', 'ericCodeTemplatesDir', + 'ericOthersDir', 'ericStylesDir', 'ericDir']: dirpath = getConfig(name) if os.path.exists(dirpath): shutil.rmtree(dirpath, True)
