python-scriptures - pypi Package Compare versions

Comparing version 2.1.2 to 2.1.3

PKG-INFO

 Metadata-Version: 1.0
 Name: python-scriptures
-Version: 2.1.2
+Version: 2.1.3
 Summary: python-scriptures is a Python package and regular expression library for validating, extracting, and normalizing biblical scripture references from blocks of text.
@@ -5,0 +5,0 @@ Home-page: http://www.davisd.com/projects/python-scriptures/

scriptures/references.py

@@ -51,28 +51,32 @@ import re
 
-    normalized = normalize_reference(bookname, chapter, verse,
+    bn, c, v, ec, ev = normalize_reference(bookname, chapter, verse,
         end_chapter, end_verse)
 
+    book = get_book(bn)
+
     # if start and end chapters are the same
-    if normalized[1] == normalized[3]:
-        book = get_book(normalized[0])
+    if c == ec:
 
         if len(book[3]) == 1: # single chapter book
             # If start and end verses are the same
-            if normalized[2] == normalized[4]:
-                return '{0} {1}'.format(*normalized[0::2])
+            if v == ev:
+                return '{0} {1}'.format(bn, v)
             else:
-                return '{0} {1}-{2}'.format(*normalized[0::2])
+                return '{0} {1}-{2}'.format(bn, v, ev)
         else: # multichapter book
             # If the start verse is one and the end verse is the last verse in
             # the chapter
-            if normalized[2] == 1 and normalized[4] == book[3][normalized[1]-1]:
-                return '{0} {1}'.format(*normalized[:2])
+            if v == 1 and ev == book[3][c-1]:
+                return '{0} {1}'.format(bn, c)
             # If start and end verses are the same
-            elif normalized[2] == normalized[4]:
-                return '{0} {1}:{2}'.format(*normalized[:3])
+            elif v == ev:
+                return '{0} {1}:{2}'.format(bn, c, v)
             else:
                 return '{0} {1}:{2}-{3}'.format(
-                    *(normalized[:3] + normalized[-1:]))
-    else: # start and end chapters are different
-        return '{0} {1}:{2}-{3}:{4}'.format(*normalized)
+                    bn, c, v, ev)
+    else: 
+        if v == 1 and ev == book[3][ec-1]:
+            return '{0} {1}-{2}'.format(bn, c, ec)
+        else: # multi-chapter, verse reference
+            return '{0} {1}:{2}-{3}:{4}'.format(bn, c, v, ec, ev)
 
@@ -87,4 +91,2 @@ def normalize_reference(bookname, chapter, verse=None,
 
-    print([bookname, chapter, verse, end_chapter, end_verse])
-
     # SPECIAL CASES FOR: BOOKS WITH ONE CHAPTER AND MULTI-CHAPTER REFERENCES
@@ -91,0 +93,0 @@

setup.py

@@ -5,3 +5,3 @@ from distutils.core import setup
     name='python-scriptures',
-    version='2.1.2',
+    version='2.1.3',
     author='David Davis',
@@ -8,0 +8,0 @@ author_email='[e-mail]',

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Lines of code

233

0.87%

Worsened metrics

Total package byte prevSize

28042

-0.44%