equal
deleted
inserted
replaced
101 result = IEC_DATE_MODEL.match(v.upper()) |
101 result = IEC_DATE_MODEL.match(v.upper()) |
102 if result is not None: |
102 if result is not None: |
103 year, month, day = result.groups() |
103 year, month, day = result.groups() |
104 try: |
104 try: |
105 date = datetime.datetime(int(year), int(month), int(day)) |
105 date = datetime.datetime(int(year), int(month), int(day)) |
106 except ValueError, e: |
106 except ValueError: |
107 return None |
107 return None |
108 base_date = datetime.datetime(1970, 1, 1) |
108 base_date = datetime.datetime(1970, 1, 1) |
109 return date - base_date |
109 return date - base_date |
110 else: |
110 else: |
111 return None |
111 return None |
115 result = IEC_DATETIME_MODEL.match(v.upper()) |
115 result = IEC_DATETIME_MODEL.match(v.upper()) |
116 if result is not None: |
116 if result is not None: |
117 year, month, day, hours, minutes, seconds = result.groups() |
117 year, month, day, hours, minutes, seconds = result.groups() |
118 try: |
118 try: |
119 date = datetime.datetime(int(year), int(month), int(day), int(hours), int(minutes), int(float(seconds)), int((float(seconds) * SECOND) % SECOND)) |
119 date = datetime.datetime(int(year), int(month), int(day), int(hours), int(minutes), int(float(seconds)), int((float(seconds) * SECOND) % SECOND)) |
120 except ValueError, e: |
120 except ValueError: |
121 return None |
121 return None |
122 base_date = datetime.datetime(1970, 1, 1) |
122 base_date = datetime.datetime(1970, 1, 1) |
123 return date - base_date |
123 return date - base_date |
124 else: |
124 else: |
125 return None |
125 return None |