Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

boulder-oracle-sprint: Fixed #3748.

  • Loading branch information...
commit 1d90cbd758d268b05a32c14ff3054b75e436e0e7 1 parent ab622a3
authored April 17, 2007

Showing 1 changed file with 2 additions and 7 deletions. Show diff stats Hide diff stats

  1. 9  django/db/models/fields/__init__.py
9  django/db/models/fields/__init__.py
@@ -580,13 +580,8 @@ def get_manipulator_new_data(self, new_data, rel=False):
580 580
     def flatten_data(self,follow, obj = None):
581 581
         val = self._get_val_from_obj(obj)
582 582
         date_field, time_field = self.get_manipulator_field_names('')
583  
-        # cx_Oracle does not support strftime
584  
-        if settings.DATABASE_ENGINE == 'oracle':
585  
-            return {date_field: (val is not None or ''),
586  
-                    time_field: (val is not None or '')}
587  
-        else:
588  
-            return {date_field: (val is not None and val.strftime("%Y-%m-%d") or ''),
589  
-                    time_field: (val is not None and val.strftime("%H:%M:%S") or '')}
  583
+        return {date_field: (val is not None and val.strftime("%Y-%m-%d") or ''),
  584
+                time_field: (val is not None and val.strftime("%H:%M:%S") or '')}
590 585
 
591 586
     def formfield(self, **kwargs):
592 587
         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}

0 notes on commit 1d90cbd

Please sign in to comment.
Something went wrong with that request. Please try again.