Mercurial Repositories > eric / file comparison
comparison: eric7/Project/Project.py
eric7/Project/Project.py
- branch
- eric7
- changeset 8761
- f05818ae6431
- parent 8620
- 84f7f7867b5f
- child 8769
- 142aea04a31b
equal
deleted
inserted
replaced
| 8760:8f3ee84ae342 | 8761:f05818ae6431 |
|---|---|
| 1556 filetype = "OTHERS" | 1556 filetype = "OTHERS" |
| 1557 bfn = os.path.basename(newfn) | 1557 bfn = os.path.basename(newfn) |
| 1558 if fnmatch.fnmatch(bfn, '*.ts') or fnmatch.fnmatch(bfn, '*.qm'): | 1558 if fnmatch.fnmatch(bfn, '*.ts') or fnmatch.fnmatch(bfn, '*.qm'): |
| 1559 filetype = "TRANSLATIONS" | 1559 filetype = "TRANSLATIONS" |
| 1560 else: | 1560 else: |
| 1561 for pattern in reversed( | 1561 for pattern in sorted(self.pdata["FILETYPES"].keys(), |
| 1562 sorted(self.pdata["FILETYPES"].keys())): | 1562 reverse=True): |
| 1563 if fnmatch.fnmatch(bfn, pattern): | 1563 if fnmatch.fnmatch(bfn, pattern): |
| 1564 filetype = self.pdata["FILETYPES"][pattern] | 1564 filetype = self.pdata["FILETYPES"][pattern] |
| 1565 break | 1565 break |
| 1566 | 1566 |
| 1567 if filetype == "__IGNORE__": | 1567 if filetype == "__IGNORE__": |
| 2065 for key in ["SOURCES", "FORMS", "INTERFACES", "PROTOCOLS", "RESOURCES", | 2065 for key in ["SOURCES", "FORMS", "INTERFACES", "PROTOCOLS", "RESOURCES", |
| 2066 "OTHERS", "TRANSLATIONS"]: | 2066 "OTHERS", "TRANSLATIONS"]: |
| 2067 for fn in self.pdata[key][:]: | 2067 for fn in self.pdata[key][:]: |
| 2068 filetype = key | 2068 filetype = key |
| 2069 bfn = os.path.basename(fn) | 2069 bfn = os.path.basename(fn) |
| 2070 for pattern in reversed( | 2070 for pattern in sorted(self.pdata["FILETYPES"].keys(), |
| 2071 sorted(self.pdata["FILETYPES"].keys())): | 2071 reverse=True): |
| 2072 if fnmatch.fnmatch(bfn, pattern): | 2072 if fnmatch.fnmatch(bfn, pattern): |
| 2073 filetype = self.pdata["FILETYPES"][pattern] | 2073 filetype = self.pdata["FILETYPES"][pattern] |
| 2074 break | 2074 break |
| 2075 | 2075 |
| 2076 if filetype != "__IGNORE__": | 2076 if filetype != "__IGNORE__": |
| 4651 dirs.append(d) | 4651 dirs.append(d) |
| 4652 continue | 4652 continue |
| 4653 | 4653 |
| 4654 filetype = "" | 4654 filetype = "" |
| 4655 bfn = os.path.basename(fn) | 4655 bfn = os.path.basename(fn) |
| 4656 for pattern in reversed( | 4656 for pattern in sorted(self.pdata["FILETYPES"].keys(), |
| 4657 sorted(self.pdata["FILETYPES"].keys())): | 4657 reverse=True): |
| 4658 if fnmatch.fnmatch(bfn, pattern): | 4658 if fnmatch.fnmatch(bfn, pattern): |
| 4659 filetype = self.pdata["FILETYPES"][pattern] | 4659 filetype = self.pdata["FILETYPES"][pattern] |
| 4660 break | 4660 break |
| 4661 | 4661 |
| 4662 if ( | 4662 if ( |
