[CalendarServer-changes] [12961] twext/trunk/setup.py

[source_changes at macosforge.org]

Revision: 12961
          http://trac.calendarserver.org//changeset/12961
Author:   wsanchez at apple.com
Date:     2014-03-18 16:12:03 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
Optional feature names were being computed incorrectly.

Modified Paths:
--------------
    twext/trunk/setup.py

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2014-03-18 23:11:37 UTC (rev 12960)
+++ twext/trunk/setup.py	2014-03-18 23:12:03 UTC (rev 12961)
@@ -136,6 +136,10 @@
 # Dependencies
 #
 
+reqs_extension = ".txt"
+reqs_opt_prefix = "py_opt_"
+
+
 requirements_dir = joinpath(dirname(__file__), "requirements")
 
 
@@ -151,9 +155,15 @@
 install_requirements = read_requirements("py_base.txt")
 
 extras_requirements = dict(
-    (reqs_filename[4:-4], read_requirements(reqs_filename))
+    (
+        reqs_filename[len(reqs_opt_prefix):-len(reqs_extension)],
+        read_requirements(reqs_filename)
+    )
     for reqs_filename in listdir(requirements_dir)
-    if reqs_filename.startswith("py_opt_") and reqs_filename.endswith(".txt")
+    if (
+        reqs_filename.startswith(reqs_opt_prefix) and
+        reqs_filename.endswith(reqs_extension)
+    )
 )
 
 # Requirements for development and testing
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/affaffd5/attachment.html>