Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from custcol trunk

Browse Source
This commit is contained in:
Charles Haley 2010-05-06 17:30:14 +01:00
commit 43caa815e6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/custom_column_widgets.py
View File

@ -375,14 +375,10 @@ class BulkText(BulkBase):
ans = original_value ans = original_value
vals = [v.strip() for v in unicode(self.adding_widget.text()).split(',')] vals = [v.strip() for v in unicode(self.adding_widget.text()).split(',')]
for t in vals: for t in vals:
print 'adding', t
if t not in ans: if t not in ans:
ans.append(t) ans.append(t)
print ans
vals = [v.strip() for v in unicode(self.removing_widget.text()).split(',')] vals = [v.strip() for v in unicode(self.removing_widget.text()).split(',')]
print 'removing', vals
for t in vals: for t in vals:
print 'deleting', t
if t in ans: if t in ans:
ans.remove(t) ans.remove(t)
return ans return ans

6
src/calibre/utils/date.py
View File

@ -25,7 +25,13 @@ class SafeLocalTimeZone(tzlocal):
return False return False
def compute_locale_info_for_parse_date(): def compute_locale_info_for_parse_date():
try:
dt = datetime.strptime('1/5/2000', "%x") dt = datetime.strptime('1/5/2000', "%x")
except ValueError:
try:
dt = datetime.strptime('1/5/01', '%x')
except:
return False
if dt.month == 5: if dt.month == 5:
return True return True
return False return False