code optimization

Author: chfw

README.rst

@@ -291,7 +291,7 @@ Development steps for code changes
 
 Upgrade your setup tools and pip. They are needed for development and testing only:
 
-#. pip install --upgrade setuptools "pip==7.1"
+#. pip install --upgrade setuptools pip
 
 Then install relevant development requirements:
 
@@ -300,7 +300,7 @@ Then install relevant development requirements:
 #. pip install -r tests/requirements.txt
 
 
-In order to update test environment, and documentation, additional setps are
+In order to update test environment, and documentation, additional steps are
 required:
 
 #. pip install moban
@@ -329,7 +329,7 @@ Although `nose` and `doctest` are both used in code testing, it is adviable that
 
 On Linux/Unix systems, please launch your tests like this::
 
-    $ make test
+    $ make
 
 On Windows systems, please issue this command::
 

docs/source/conf.py

@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+DESCRIPTION = (
+    'A wrapper library to read, manipulate and write data in ods format' +
+    ''
+)
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
@@ -25,15 +29,19 @@
 htmlhelp_basename = 'pyexcel-ods3doc'
 latex_elements = {}
 latex_documents = [
-    ('index', 'pyexcel-ods3.tex', u'pyexcel-ods3 Documentation',
+    ('index', 'pyexcel-ods3.tex',
+     'pyexcel-ods3 Documentation',
      'Onni Software Ltd.', 'manual'),
 ]
 man_pages = [
-    ('index', 'pyexcel-ods3', u'pyexcel-ods3 Documentation',
+    ('index', 'pyexcel-ods3',
+     'pyexcel-ods3 Documentation',
      [u'Onni Software Ltd.'], 1)
 ]
 texinfo_documents = [
-    ('index', 'pyexcel-ods3', u'pyexcel-ods3 Documentation',
-     'Onni Software Ltd.', 'pyexcel-ods3', 'One line description of project.',
+    ('index', 'pyexcel-ods3',
+     'pyexcel-ods3 Documentation',
+     'Onni Software Ltd.', 'pyexcel-ods3',
+     DESCRIPTION,
      'Miscellaneous'),
 ]

pyexcel_ods3/converter.py

@@ -37,13 +37,17 @@ def time_value(value):
     """convert to time value accroding the specification"""
     import re
     results = re.match('PT(\d+)H(\d+)M(\d+)S', value)
-    hour = int(results.group(1))
-    minute = int(results.group(2))
-    second = int(results.group(3))
-    if hour < 24:
-        ret = datetime.time(hour, minute, second)
+    if results:
+        hour = int(results.group(1))
+        minute = int(results.group(2))
+        second = int(results.group(3))
+        if hour < 24:
+            ret = datetime.time(hour, minute, second)
+        else:
+            ret = datetime.timedelta(
+                hours=hour, minutes=minute, seconds=second)
     else:
-        ret = datetime.timedelta(hours=hour, minutes=minute, seconds=second)
+        ret = None
     return ret
 
 

test.bat

@@ -1,4 +1,2 @@
-
-
 pip freeze
-nosetests --with-cov --cover-package pyexcel_ods3 --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst docs/source pyexcel_ods3 && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_ods3 --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_ods3 && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

test.sh

@@ -1,4 +1,2 @@
-
-
 pip freeze
-nosetests --with-cov --cover-package pyexcel_ods3 --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst docs/source pyexcel_ods3 && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_ods3 --cover-package tests --with-doctest --doctest-extension=.rst README.rst tests docs/source pyexcel_ods3 && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

tests/base.py

@@ -1,7 +1,7 @@
-import os
+import os  # noqa
 import pyexcel
-import datetime
-from nose.tools import raises, eq_
+import datetime  # noqa
+from nose.tools import raises, eq_  # noqa
 
 
 def create_sample_file1(file):

tests/test_bug_fixes.py

@@ -86,3 +86,9 @@ def test_issue_8():
     data = get_data(os.path.join("tests", "fixtures", test_file),
                     skip_empty_rows=True)
     eq_(data['Sheet1'][0][0].days, 12)
+
+
+def test_issue_8_1():
+    from pyexcel_ods3.converter import time_value
+    result = time_value('PT1111')
+    eq_(result, None)