Mercurial Repositories > eric / file comparison
comparison: Project/Project.py
Project/Project.py
- changeset 6228
- 9c3fbf39ec9b
- parent 6209
- 05b9989c1977
- child 6240
- 3ea0b969f608
equal
deleted
inserted
replaced
| 6227:fc0869cd16dc | 6228:9c3fbf39ec9b |
|---|---|
| 1399 | 1399 |
| 1400 try: | 1400 try: |
| 1401 fn = os.path.join(self.ppath, langFile) | 1401 fn = os.path.join(self.ppath, langFile) |
| 1402 if os.path.exists(fn): | 1402 if os.path.exists(fn): |
| 1403 s2t(fn) | 1403 s2t(fn) |
| 1404 except EnvironmentError: | 1404 except EnvironmentError as err: |
| 1405 E5MessageBox.critical( | 1405 E5MessageBox.critical( |
| 1406 self.ui, | 1406 self.ui, |
| 1407 self.tr("Delete translation"), | 1407 self.tr("Delete translation"), |
| 1408 self.tr( | 1408 self.tr( |
| 1409 "<p>The selected translation file <b>{0}</b> could not be" | 1409 "<p>The selected translation file <b>{0}</b> could not be" |
| 1410 " deleted.</p>").format(langFile)) | 1410 " deleted.</p><p>Reason: {1}</p>").format( |
| 1411 langFile, str(err))) | |
| 1411 return | 1412 return |
| 1412 | 1413 |
| 1413 self.removeLanguageFile(langFile) | 1414 self.removeLanguageFile(langFile) |
| 1414 | 1415 |
| 1415 # now get rid of the .qm file | 1416 # now get rid of the .qm file |
| 1420 os.path.join(self.pdata["TRANSLATIONSBINPATH"], | 1421 os.path.join(self.pdata["TRANSLATIONSBINPATH"], |
| 1421 os.path.basename(qmFile))) | 1422 os.path.basename(qmFile))) |
| 1422 fn = os.path.join(self.ppath, qmFile) | 1423 fn = os.path.join(self.ppath, qmFile) |
| 1423 if os.path.exists(fn): | 1424 if os.path.exists(fn): |
| 1424 s2t(fn) | 1425 s2t(fn) |
| 1425 except EnvironmentError: | 1426 except EnvironmentError as err: |
| 1426 E5MessageBox.critical( | 1427 E5MessageBox.critical( |
| 1427 self.ui, | 1428 self.ui, |
| 1428 self.tr("Delete translation"), | 1429 self.tr("Delete translation"), |
| 1429 self.tr( | 1430 self.tr( |
| 1430 "<p>The selected translation file <b>{0}</b> could" | 1431 "<p>The selected translation file <b>{0}</b> could" |
| 1431 " not be deleted.</p>").format(qmFile)) | 1432 " not be deleted.</p><p>Reason: {1}</p>").format( |
| 1433 qmFile, str(err))) | |
| 1432 return | 1434 return |
| 1433 | 1435 |
| 1434 def appendFile(self, fn, isSourceFile=False, updateModel=True): | 1436 def appendFile(self, fn, isSourceFile=False, updateModel=True): |
| 1435 """ | 1437 """ |
| 1436 Public method to append a file to the project. | 1438 Public method to append a file to the project. |
| 2117 pat = os.path.join( | 2119 pat = os.path.join( |
| 2118 self.ppath, head, | 2120 self.ppath, head, |
| 2119 "__pycache__", "{0}.*{1}".format(tail, ext)) | 2121 "__pycache__", "{0}.*{1}".format(tail, ext)) |
| 2120 for f in glob.glob(pat): | 2122 for f in glob.glob(pat): |
| 2121 s2t(f) | 2123 s2t(f) |
| 2122 except EnvironmentError: | 2124 except EnvironmentError as err: |
| 2123 E5MessageBox.critical( | 2125 E5MessageBox.critical( |
| 2124 self.ui, | 2126 self.ui, |
| 2125 self.tr("Delete file"), | 2127 self.tr("Delete file"), |
| 2126 self.tr( | 2128 self.tr( |
| 2127 "<p>The selected file <b>{0}</b> could not be" | 2129 "<p>The selected file <b>{0}</b> could not be" |
| 2128 " deleted.</p>").format(fn)) | 2130 " deleted.</p><p>Reason: {1}</p>").format( |
| 2131 fn, str(err))) | |
| 2129 return False | 2132 return False |
| 2130 | 2133 |
| 2131 self.removeFile(fn) | 2134 self.removeFile(fn) |
| 2132 if ext == '.ui': | 2135 if ext == '.ui': |
| 2133 self.removeFile(fn + '.h') | 2136 self.removeFile(fn + '.h') |
| 2146 try: | 2149 try: |
| 2147 from ThirdParty.Send2Trash.send2trash import send2trash | 2150 from ThirdParty.Send2Trash.send2trash import send2trash |
| 2148 send2trash(dn) | 2151 send2trash(dn) |
| 2149 except ImportError: | 2152 except ImportError: |
| 2150 shutil.rmtree(dn, True) | 2153 shutil.rmtree(dn, True) |
| 2151 except EnvironmentError: | 2154 except EnvironmentError as err: |
| 2152 E5MessageBox.critical( | 2155 E5MessageBox.critical( |
| 2153 self.ui, | 2156 self.ui, |
| 2154 self.tr("Delete directory"), | 2157 self.tr("Delete directory"), |
| 2155 self.tr( | 2158 self.tr( |
| 2156 "<p>The selected directory <b>{0}</b> could not be" | 2159 "<p>The selected directory <b>{0}</b> could not be" |
| 2157 " deleted.</p>").format(dn)) | 2160 " deleted.</p><p>Reason: {1}</p>").format(dn, str(err))) |
| 2158 return False | 2161 return False |
| 2159 | 2162 |
| 2160 self.removeDirectory(dn) | 2163 self.removeDirectory(dn) |
| 2161 return True | 2164 return True |
| 2162 | 2165 |
