[Python-modules-commits] [django-guardian] 12/13: merge patched into master
Brian May
bam at moszumanska.debian.org
Tue Nov 3 10:02:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-guardian.
commit 939f013b816c5b3c85e202425ce1cf9c5cb3db2d
Merge: b97222b 55f6014
Author: Brian May <brian at linuxpenguins.xyz>
Date: Tue Nov 3 19:50:34 2015 +1100
merge patched into master
.travis.yml | 27 ++--
AUTHORS | 4 +
CHANGES | 11 +-
benchmarks/run_benchmarks.py | 14 +-
debian/.git-dpm | 6 +-
...-Append-uncompressed-JavaScript-libraries.patch | 2 +-
.../0002-Remove-nonlocal-image-for-Travis-ci.patch | 2 +-
docs/userguide/assign.rst | 5 +-
example_project/settings.py | 6 +-
guardian/__init__.py | 2 +-
guardian/admin.py | 16 +-
guardian/backends.py | 70 ++++++---
guardian/compat.py | 18 ++-
guardian/management/__init__.py | 5 +-
guardian/migrations/0001_initial.py | 163 +++++++--------------
guardian/models.py | 7 +-
guardian/shortcuts.py | 78 +++++++++-
.../0001_initial.py | 0
...tpermission_object_pk__add_field_userobjectp.py | 0
.../0003_update_objectpermission_object_pk.py | 0
...tpermission_object_id__del_unique_groupobjec.py | 0
...tpermission_object_pk__chg_field_userobjectp.py | 0
guardian/south_migrations/__init__.py | 0
guardian/templatetags/guardian_tags.py | 10 +-
guardian/testapp/migrations/0001_initial.py | 2 +-
guardian/testapp/tests/admin_test.py | 4 +-
guardian/testapp/tests/direct_rel_test.py | 16 ++
guardian/testapp/tests/orphans_test.py | 5 +-
guardian/testapp/tests/shortcuts_test.py | 157 +++++++++++++++++++-
guardian/testsettings.py | 5 +-
tests.py | 9 +-
tox.ini | 18 +++
32 files changed, 476 insertions(+), 186 deletions(-)
diff --cc debian/.git-dpm
index aab2918,0000000..5bfe97d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 509aee5e579a31acdad99057d10e5738d1df6e53
- 509aee5e579a31acdad99057d10e5738d1df6e53
- f5c84736db787d36525136be260882cd076dbba6
++55f60146a70144516d3096ede651d507b3469630
++55f60146a70144516d3096ede651d507b3469630
++94753ae8e998c63b43db42d8921dd6c8804c59b3
+94753ae8e998c63b43db42d8921dd6c8804c59b3
+django-guardian_1.3.orig.tar.gz
+5105ce89b4a4a9f22fa504ce6c4b418fcef7fb3b
+351315
diff --cc debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
index 26b4b36,0000000..9a9231a
mode 100644,000000..100644
--- a/debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
+++ b/debian/patches/0001-Append-uncompressed-JavaScript-libraries.patch
@@@ -1,8457 -1,0 +1,8457 @@@
- From 14276942faa056f72d746b51775b6bec36d999d1 Mon Sep 17 00:00:00 2001
++From ea49d47891a10a9f99a69b31c8616927c89fcee7 Mon Sep 17 00:00:00 2001
+From: "Twitter, Inc" <Twitter, Inc>
+Date: Tue, 3 Nov 2015 19:47:23 +1100
+Subject: Append uncompressed JavaScript libraries
+
+ Append uncompressed JavaScript libraries as following.
+ - Twitter Bootstrap
+ - example_project/static/js/bootstrap.js
+ - example_project/static/css/bootstrap.css
+Origin: https://github.com/twbs/bootstrap/archive/v2.3.0.tar.gz
+Last-Update: 2013-02-07
+---
+ example_project/static/css/bootstrap.css | 6158 ++++++++++++++++++++++++++++++
+ example_project/static/js/bootstrap.js | 2268 +++++++++++
+ 2 files changed, 8426 insertions(+)
+ create mode 100644 example_project/static/css/bootstrap.css
+ create mode 100644 example_project/static/js/bootstrap.js
+
+diff --git a/example_project/static/css/bootstrap.css b/example_project/static/css/bootstrap.css
+new file mode 100644
+index 0000000..b255056
+--- /dev/null
++++ b/example_project/static/css/bootstrap.css
+@@ -0,0 +1,6158 @@
++/*!
++ * Bootstrap v2.3.0
++ *
++ * Copyright 2012 Twitter, Inc
++ * Licensed under the Apache License v2.0
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Designed and built with all the love in the world @twitter by @mdo and @fat.
++ */
++
++.clearfix {
++ *zoom: 1;
++}
++
++.clearfix:before,
++.clearfix:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.clearfix:after {
++ clear: both;
++}
++
++.hide-text {
++ font: 0/0 a;
++ color: transparent;
++ text-shadow: none;
++ background-color: transparent;
++ border: 0;
++}
++
++.input-block-level {
++ display: block;
++ width: 100%;
++ min-height: 30px;
++ -webkit-box-sizing: border-box;
++ -moz-box-sizing: border-box;
++ box-sizing: border-box;
++}
++
++article,
++aside,
++details,
++figcaption,
++figure,
++footer,
++header,
++hgroup,
++nav,
++section {
++ display: block;
++}
++
++audio,
++canvas,
++video {
++ display: inline-block;
++ *display: inline;
++ *zoom: 1;
++}
++
++audio:not([controls]) {
++ display: none;
++}
++
++html {
++ font-size: 100%;
++ -webkit-text-size-adjust: 100%;
++ -ms-text-size-adjust: 100%;
++}
++
++a:focus {
++ outline: thin dotted #333;
++ outline: 5px auto -webkit-focus-ring-color;
++ outline-offset: -2px;
++}
++
++a:hover,
++a:active {
++ outline: 0;
++}
++
++sub,
++sup {
++ position: relative;
++ font-size: 75%;
++ line-height: 0;
++ vertical-align: baseline;
++}
++
++sup {
++ top: -0.5em;
++}
++
++sub {
++ bottom: -0.25em;
++}
++
++img {
++ width: auto\9;
++ height: auto;
++ max-width: 100%;
++ vertical-align: middle;
++ border: 0;
++ -ms-interpolation-mode: bicubic;
++}
++
++#map_canvas img,
++.google-maps img {
++ max-width: none;
++}
++
++button,
++input,
++select,
++textarea {
++ margin: 0;
++ font-size: 100%;
++ vertical-align: middle;
++}
++
++button,
++input {
++ *overflow: visible;
++ line-height: normal;
++}
++
++button::-moz-focus-inner,
++input::-moz-focus-inner {
++ padding: 0;
++ border: 0;
++}
++
++button,
++html input[type="button"],
++input[type="reset"],
++input[type="submit"] {
++ cursor: pointer;
++ -webkit-appearance: button;
++}
++
++label,
++select,
++button,
++input[type="button"],
++input[type="reset"],
++input[type="submit"],
++input[type="radio"],
++input[type="checkbox"] {
++ cursor: pointer;
++}
++
++input[type="search"] {
++ -webkit-box-sizing: content-box;
++ -moz-box-sizing: content-box;
++ box-sizing: content-box;
++ -webkit-appearance: textfield;
++}
++
++input[type="search"]::-webkit-search-decoration,
++input[type="search"]::-webkit-search-cancel-button {
++ -webkit-appearance: none;
++}
++
++textarea {
++ overflow: auto;
++ vertical-align: top;
++}
++
++ at media print {
++ * {
++ color: #000 !important;
++ text-shadow: none !important;
++ background: transparent !important;
++ box-shadow: none !important;
++ }
++ a,
++ a:visited {
++ text-decoration: underline;
++ }
++ a[href]:after {
++ content: " (" attr(href) ")";
++ }
++ abbr[title]:after {
++ content: " (" attr(title) ")";
++ }
++ .ir a:after,
++ a[href^="javascript:"]:after,
++ a[href^="#"]:after {
++ content: "";
++ }
++ pre,
++ blockquote {
++ border: 1px solid #999;
++ page-break-inside: avoid;
++ }
++ thead {
++ display: table-header-group;
++ }
++ tr,
++ img {
++ page-break-inside: avoid;
++ }
++ img {
++ max-width: 100% !important;
++ }
++ @page {
++ margin: 0.5cm;
++ }
++ p,
++ h2,
++ h3 {
++ orphans: 3;
++ widows: 3;
++ }
++ h2,
++ h3 {
++ page-break-after: avoid;
++ }
++}
++
++body {
++ margin: 0;
++ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
++ font-size: 14px;
++ line-height: 20px;
++ color: #333333;
++ background-color: #ffffff;
++}
++
++a {
++ color: #0088cc;
++ text-decoration: none;
++}
++
++a:hover,
++a:focus {
++ color: #005580;
++ text-decoration: underline;
++}
++
++.img-rounded {
++ -webkit-border-radius: 6px;
++ -moz-border-radius: 6px;
++ border-radius: 6px;
++}
++
++.img-polaroid {
++ padding: 4px;
++ background-color: #fff;
++ border: 1px solid #ccc;
++ border: 1px solid rgba(0, 0, 0, 0.2);
++ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
++ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
++ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
++}
++
++.img-circle {
++ -webkit-border-radius: 500px;
++ -moz-border-radius: 500px;
++ border-radius: 500px;
++}
++
++.row {
++ margin-left: -20px;
++ *zoom: 1;
++}
++
++.row:before,
++.row:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.row:after {
++ clear: both;
++}
++
++[class*="span"] {
++ float: left;
++ min-height: 1px;
++ margin-left: 20px;
++}
++
++.container,
++.navbar-static-top .container,
++.navbar-fixed-top .container,
++.navbar-fixed-bottom .container {
++ width: 940px;
++}
++
++.span12 {
++ width: 940px;
++}
++
++.span11 {
++ width: 860px;
++}
++
++.span10 {
++ width: 780px;
++}
++
++.span9 {
++ width: 700px;
++}
++
++.span8 {
++ width: 620px;
++}
++
++.span7 {
++ width: 540px;
++}
++
++.span6 {
++ width: 460px;
++}
++
++.span5 {
++ width: 380px;
++}
++
++.span4 {
++ width: 300px;
++}
++
++.span3 {
++ width: 220px;
++}
++
++.span2 {
++ width: 140px;
++}
++
++.span1 {
++ width: 60px;
++}
++
++.offset12 {
++ margin-left: 980px;
++}
++
++.offset11 {
++ margin-left: 900px;
++}
++
++.offset10 {
++ margin-left: 820px;
++}
++
++.offset9 {
++ margin-left: 740px;
++}
++
++.offset8 {
++ margin-left: 660px;
++}
++
++.offset7 {
++ margin-left: 580px;
++}
++
++.offset6 {
++ margin-left: 500px;
++}
++
++.offset5 {
++ margin-left: 420px;
++}
++
++.offset4 {
++ margin-left: 340px;
++}
++
++.offset3 {
++ margin-left: 260px;
++}
++
++.offset2 {
++ margin-left: 180px;
++}
++
++.offset1 {
++ margin-left: 100px;
++}
++
++.row-fluid {
++ width: 100%;
++ *zoom: 1;
++}
++
++.row-fluid:before,
++.row-fluid:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.row-fluid:after {
++ clear: both;
++}
++
++.row-fluid [class*="span"] {
++ display: block;
++ float: left;
++ width: 100%;
++ min-height: 30px;
++ margin-left: 2.127659574468085%;
++ *margin-left: 2.074468085106383%;
++ -webkit-box-sizing: border-box;
++ -moz-box-sizing: border-box;
++ box-sizing: border-box;
++}
++
++.row-fluid [class*="span"]:first-child {
++ margin-left: 0;
++}
++
++.row-fluid .controls-row [class*="span"] + [class*="span"] {
++ margin-left: 2.127659574468085%;
++}
++
++.row-fluid .span12 {
++ width: 100%;
++ *width: 99.94680851063829%;
++}
++
++.row-fluid .span11 {
++ width: 91.48936170212765%;
++ *width: 91.43617021276594%;
++}
++
++.row-fluid .span10 {
++ width: 82.97872340425532%;
++ *width: 82.92553191489361%;
++}
++
++.row-fluid .span9 {
++ width: 74.46808510638297%;
++ *width: 74.41489361702126%;
++}
++
++.row-fluid .span8 {
++ width: 65.95744680851064%;
++ *width: 65.90425531914893%;
++}
++
++.row-fluid .span7 {
++ width: 57.44680851063829%;
++ *width: 57.39361702127659%;
++}
++
++.row-fluid .span6 {
++ width: 48.93617021276595%;
++ *width: 48.88297872340425%;
++}
++
++.row-fluid .span5 {
++ width: 40.42553191489362%;
++ *width: 40.37234042553192%;
++}
++
++.row-fluid .span4 {
++ width: 31.914893617021278%;
++ *width: 31.861702127659576%;
++}
++
++.row-fluid .span3 {
++ width: 23.404255319148934%;
++ *width: 23.351063829787233%;
++}
++
++.row-fluid .span2 {
++ width: 14.893617021276595%;
++ *width: 14.840425531914894%;
++}
++
++.row-fluid .span1 {
++ width: 6.382978723404255%;
++ *width: 6.329787234042553%;
++}
++
++.row-fluid .offset12 {
++ margin-left: 104.25531914893617%;
++ *margin-left: 104.14893617021275%;
++}
++
++.row-fluid .offset12:first-child {
++ margin-left: 102.12765957446808%;
++ *margin-left: 102.02127659574467%;
++}
++
++.row-fluid .offset11 {
++ margin-left: 95.74468085106382%;
++ *margin-left: 95.6382978723404%;
++}
++
++.row-fluid .offset11:first-child {
++ margin-left: 93.61702127659574%;
++ *margin-left: 93.51063829787232%;
++}
++
++.row-fluid .offset10 {
++ margin-left: 87.23404255319149%;
++ *margin-left: 87.12765957446807%;
++}
++
++.row-fluid .offset10:first-child {
++ margin-left: 85.1063829787234%;
++ *margin-left: 84.99999999999999%;
++}
++
++.row-fluid .offset9 {
++ margin-left: 78.72340425531914%;
++ *margin-left: 78.61702127659572%;
++}
++
++.row-fluid .offset9:first-child {
++ margin-left: 76.59574468085106%;
++ *margin-left: 76.48936170212764%;
++}
++
++.row-fluid .offset8 {
++ margin-left: 70.2127659574468%;
++ *margin-left: 70.10638297872339%;
++}
++
++.row-fluid .offset8:first-child {
++ margin-left: 68.08510638297872%;
++ *margin-left: 67.9787234042553%;
++}
++
++.row-fluid .offset7 {
++ margin-left: 61.70212765957446%;
++ *margin-left: 61.59574468085106%;
++}
++
++.row-fluid .offset7:first-child {
++ margin-left: 59.574468085106375%;
++ *margin-left: 59.46808510638297%;
++}
++
++.row-fluid .offset6 {
++ margin-left: 53.191489361702125%;
++ *margin-left: 53.085106382978715%;
++}
++
++.row-fluid .offset6:first-child {
++ margin-left: 51.063829787234035%;
++ *margin-left: 50.95744680851063%;
++}
++
++.row-fluid .offset5 {
++ margin-left: 44.68085106382979%;
++ *margin-left: 44.57446808510638%;
++}
++
++.row-fluid .offset5:first-child {
++ margin-left: 42.5531914893617%;
++ *margin-left: 42.4468085106383%;
++}
++
++.row-fluid .offset4 {
++ margin-left: 36.170212765957444%;
++ *margin-left: 36.06382978723405%;
++}
++
++.row-fluid .offset4:first-child {
++ margin-left: 34.04255319148936%;
++ *margin-left: 33.93617021276596%;
++}
++
++.row-fluid .offset3 {
++ margin-left: 27.659574468085104%;
++ *margin-left: 27.5531914893617%;
++}
++
++.row-fluid .offset3:first-child {
++ margin-left: 25.53191489361702%;
++ *margin-left: 25.425531914893618%;
++}
++
++.row-fluid .offset2 {
++ margin-left: 19.148936170212764%;
++ *margin-left: 19.04255319148936%;
++}
++
++.row-fluid .offset2:first-child {
++ margin-left: 17.02127659574468%;
++ *margin-left: 16.914893617021278%;
++}
++
++.row-fluid .offset1 {
++ margin-left: 10.638297872340425%;
++ *margin-left: 10.53191489361702%;
++}
++
++.row-fluid .offset1:first-child {
++ margin-left: 8.51063829787234%;
++ *margin-left: 8.404255319148938%;
++}
++
++[class*="span"].hide,
++.row-fluid [class*="span"].hide {
++ display: none;
++}
++
++[class*="span"].pull-right,
++.row-fluid [class*="span"].pull-right {
++ float: right;
++}
++
++.container {
++ margin-right: auto;
++ margin-left: auto;
++ *zoom: 1;
++}
++
++.container:before,
++.container:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.container:after {
++ clear: both;
++}
++
++.container-fluid {
++ padding-right: 20px;
++ padding-left: 20px;
++ *zoom: 1;
++}
++
++.container-fluid:before,
++.container-fluid:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.container-fluid:after {
++ clear: both;
++}
++
++p {
++ margin: 0 0 10px;
++}
++
++.lead {
++ margin-bottom: 20px;
++ font-size: 21px;
++ font-weight: 200;
++ line-height: 30px;
++}
++
++small {
++ font-size: 85%;
++}
++
++strong {
++ font-weight: bold;
++}
++
++em {
++ font-style: italic;
++}
++
++cite {
++ font-style: normal;
++}
++
++.muted {
++ color: #999999;
++}
++
++a.muted:hover,
++a.muted:focus {
++ color: #808080;
++}
++
++.text-warning {
++ color: #c09853;
++}
++
++a.text-warning:hover,
++a.text-warning:focus {
++ color: #a47e3c;
++}
++
++.text-error {
++ color: #b94a48;
++}
++
++a.text-error:hover,
++a.text-error:focus {
++ color: #953b39;
++}
++
++.text-info {
++ color: #3a87ad;
++}
++
++a.text-info:hover,
++a.text-info:focus {
++ color: #2d6987;
++}
++
++.text-success {
++ color: #468847;
++}
++
++a.text-success:hover,
++a.text-success:focus {
++ color: #356635;
++}
++
++.text-left {
++ text-align: left;
++}
++
++.text-right {
++ text-align: right;
++}
++
++.text-center {
++ text-align: center;
++}
++
++h1,
++h2,
++h3,
++h4,
++h5,
++h6 {
++ margin: 10px 0;
++ font-family: inherit;
++ font-weight: bold;
++ line-height: 20px;
++ color: inherit;
++ text-rendering: optimizelegibility;
++}
++
++h1 small,
++h2 small,
++h3 small,
++h4 small,
++h5 small,
++h6 small {
++ font-weight: normal;
++ line-height: 1;
++ color: #999999;
++}
++
++h1,
++h2,
++h3 {
++ line-height: 40px;
++}
++
++h1 {
++ font-size: 38.5px;
++}
++
++h2 {
++ font-size: 31.5px;
++}
++
++h3 {
++ font-size: 24.5px;
++}
++
++h4 {
++ font-size: 17.5px;
++}
++
++h5 {
++ font-size: 14px;
++}
++
++h6 {
++ font-size: 11.9px;
++}
++
++h1 small {
++ font-size: 24.5px;
++}
++
++h2 small {
++ font-size: 17.5px;
++}
++
++h3 small {
++ font-size: 14px;
++}
++
++h4 small {
++ font-size: 14px;
++}
++
++.page-header {
++ padding-bottom: 9px;
++ margin: 20px 0 30px;
++ border-bottom: 1px solid #eeeeee;
++}
++
++ul,
++ol {
++ padding: 0;
++ margin: 0 0 10px 25px;
++}
++
++ul ul,
++ul ol,
++ol ol,
++ol ul {
++ margin-bottom: 0;
++}
++
++li {
++ line-height: 20px;
++}
++
++ul.unstyled,
++ol.unstyled {
++ margin-left: 0;
++ list-style: none;
++}
++
++ul.inline,
++ol.inline {
++ margin-left: 0;
++ list-style: none;
++}
++
++ul.inline > li,
++ol.inline > li {
++ display: inline-block;
++ *display: inline;
++ padding-right: 5px;
++ padding-left: 5px;
++ *zoom: 1;
++}
++
++dl {
++ margin-bottom: 20px;
++}
++
++dt,
++dd {
++ line-height: 20px;
++}
++
++dt {
++ font-weight: bold;
++}
++
++dd {
++ margin-left: 10px;
++}
++
++.dl-horizontal {
++ *zoom: 1;
++}
++
++.dl-horizontal:before,
++.dl-horizontal:after {
++ display: table;
++ line-height: 0;
++ content: "";
++}
++
++.dl-horizontal:after {
++ clear: both;
++}
++
++.dl-horizontal dt {
++ float: left;
++ width: 160px;
++ overflow: hidden;
++ clear: left;
++ text-align: right;
++ text-overflow: ellipsis;
++ white-space: nowrap;
++}
++
++.dl-horizontal dd {
++ margin-left: 180px;
++}
++
++hr {
++ margin: 20px 0;
++ border: 0;
++ border-top: 1px solid #eeeeee;
++ border-bottom: 1px solid #ffffff;
++}
++
++abbr[title],
++abbr[data-original-title] {
++ cursor: help;
++ border-bottom: 1px dotted #999999;
++}
++
++abbr.initialism {
++ font-size: 90%;
++ text-transform: uppercase;
... 7568 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-guardian.git
More information about the Python-modules-commits
mailing list