<fix> fix naive datetime format bug

Author:rapospectre@gmail.com

Desc: fix naive datetime type will be format to a string by a tzinfo

Author: bluedazzle

.gitignore

@@ -7,4 +7,5 @@
 src/django_simple_serializer.egg-info/
 src/dist/
 src/build/
-.coverage
+.coverage
+fabfile.py

fabfile.py

@@ -0,0 +1,9 @@
+from fabric.api import run, env, local
+
+
+def push(commit, title, desc):
+    mail = "rapospectre@gmail.com"
+    commit_message = '<{0}>  {1}\r\n\r\nAuthor:{2}\r\n\r\nDesc: {3}'.format(commit, title, mail, desc)
+    local("git add .")
+    local("git commit -m '{0}'".format(commit_message))
+    local("git push origin master")

src/dss/Serializer.py

@@ -8,7 +8,6 @@
 from decimal import Decimal
 
 from .TimeFormatFactory import TimeFormatFactory
-from .Warning import remove_check
 
 try:
     from django.db import models

src/dss/TimeFormatFactory.py

@@ -17,9 +17,9 @@ def __init__(self):
     @staticmethod
     def datetime_to_string(datetime_time, time_format='%Y-%m-%d %H:%M:%S'):
         if isinstance(datetime_time, datetime.datetime):
-            if not datetime_time.tzinfo:
+            if datetime_time.tzinfo:
                 datetime_time = datetime_time.astimezone(timezone.get_current_timezone())
-                return datetime_time.strftime(time_format)
+            return datetime_time.strftime(time_format)
         elif isinstance(datetime_time, datetime.time):
             time_format = '%H:%M:%S'
         elif isinstance(datetime_time, datetime.date):
@@ -29,9 +29,9 @@ def datetime_to_string(datetime_time, time_format='%Y-%m-%d %H:%M:%S'):
     @staticmethod
     def datetime_to_timestamp(datetime_time, time_format=None):
         if isinstance(datetime_time, datetime.datetime):
-            if not datetime_time.tzinfo:
+            if datetime_time.tzinfo:
                 datetime_time = datetime_time.astimezone(timezone.get_current_timezone())
-                return time.mktime(datetime_time.timetuple())
+            return time.mktime(datetime_time.timetuple())
         return time.mktime(datetime_time.timetuple())
 
     @staticmethod

src/setup.py

@@ -26,7 +26,7 @@ def read(fname):
 
 URL = "https://github.com/bluedazzle/django-simple-serializer"
 
-VERSION = "2.0.3"
+VERSION = "2.0.4"
 
 LICENSE = "MIT"