[cc-commits] [SCM] License chooser & etc (branch master) updated. 16374ade132a790db6efe64b3b994d6cdfdcbd18

git version control git at a7.creativecommons.org
Tue Jul 6 17:23:14 EDT 2010


The branch, master has been updated
       via  16374ade132a790db6efe64b3b994d6cdfdcbd18 (commit)
       via  dc271620a94069bf0bbcb096449c3d8149ccdfed (commit)
       via  9246d906dd0589e5e4de1066de0db5fb9670ce29 (commit)
      from  eb7096e9c44e16453ae718b36c7b049d76085974 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 16374ade132a790db6efe64b3b994d6cdfdcbd18
Author: Nathan R. Yergler <nathan at yergler.net>
Date:   Tue Jul 6 14:22:23 2010 -0700

    Tests for field_jurisdiction and jurisdiction pass.

commit dc271620a94069bf0bbcb096449c3d8149ccdfed
Author: Nathan R. Yergler <nathan at yergler.net>
Date:   Tue Jul 6 14:22:09 2010 -0700

    Tests for Request -> License wrapper used by chooser.

commit 9246d906dd0589e5e4de1066de0db5fb9670ce29
Author: Nathan R. Yergler <nathan at yergler.net>
Date:   Tue Jul 6 14:21:37 2010 -0700

    Make cc.engine.tests a package so nose can traverse it correctly.

-----------------------------------------------------------------------

Summary of changes (followed by patch):
 cc/engine/chooser/views.py                      |    3 +-
 cc/engine/{characteristic => tests}/__init__.py |    0
 cc/engine/tests/test_chooser.py                 |   35 +++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletions(-)
 copy cc/engine/{characteristic => tests}/__init__.py (100%)
 create mode 100644 cc/engine/tests/test_chooser.py

diff --git a/cc/engine/chooser/views.py b/cc/engine/chooser/views.py
index 454b5eb..5b90fea 100644
--- a/cc/engine/chooser/views.py
+++ b/cc/engine/chooser/views.py
@@ -134,7 +134,8 @@ def _formatter_work_dict(request_form):
 def _issue_license(request_form):
     """Extract the license engine fields from the request and return a
     License object."""
-    jurisdiction = request_form.get('field_jurisdiction')
+    jurisdiction = request_form.get('field_jurisdiction',
+                                    request_form.get('jurisdiction'))
     version = request_form.get('version', None)
 
     # Handle public domain class
diff --git a/cc/engine/characteristic/__init__.py b/cc/engine/tests/__init__.py
similarity index 100%
copy from cc/engine/characteristic/__init__.py
copy to cc/engine/tests/__init__.py
diff --git a/cc/engine/tests/test_chooser.py b/cc/engine/tests/test_chooser.py
new file mode 100644
index 0000000..5fc1321
--- /dev/null
+++ b/cc/engine/tests/test_chooser.py
@@ -0,0 +1,35 @@
+def test_issue_license_with_license_code():
+    """Test cc.engine.chooser.views_issue_license by specifying a
+    license code."""
+
+    import cc.engine.chooser.views as views
+    from webob import Request
+
+    # request for CC BY Unported, latest version
+    request = Request.blank('/results-one')
+    request.GET.add('license_code', 'by')
+
+    assert views._issue_license(request.GET).uri == 'http://creativecommons.org/licenses/by/3.0/'
+
+    # request for CC BY Unported, specific version
+    request = Request.blank('/results-one')
+    request.GET.add('license_code', 'by')
+    request.GET.add('version', '2.0')
+
+    assert views._issue_license(request.GET).uri == 'http://creativecommons.org/licenses/by/2.0/'
+
+    # request for CC BY Australia
+    request = Request.blank('/results-one')
+    request.GET.add('license_code', 'by')
+    request.GET.add('field_jurisdiction', 'au')
+
+    assert views._issue_license(request.GET).uri == 'http://creativecommons.org/licenses/by/3.0/au/'
+
+    # request for CC BY Australia using "jurisdiction" as the query string param
+    request = Request.blank('/results-one')
+    request.GET.add('license_code', 'by')
+    request.GET.add('jurisdiction', 'au')
+
+    assert views._issue_license(request.GET).uri == 'http://creativecommons.org/licenses/by/3.0/au/'
+
+    


hooks/post-receive
-- 
License chooser & etc



More information about the cc-commits mailing list