Hello community, here is the log from the commit of package python-dojango for openSUSE:Factory checked in at 2011-11-25 11:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dojango (Old) and /work/SRC/openSUSE:Factory/.python-dojango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dojango", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-dojango/python-dojango.changes 2011-09-23 12:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-dojango.new/python-dojango.changes 2011-11-25 10:13:17.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 7 17:31:45 UTC 2011 - [email protected] + +- Update to 0.5.4: + - Sorry, no changelog atm. + +------------------------------------------------------------------- +Mon Nov 7 00:38:29 UTC 2011 - [email protected] + +- Update to 0.5.3: + - Sorry, no changelog atm. + +------------------------------------------------------------------- Old: ---- dojango-0.5.2.tar.bz2 New: ---- dojango-0.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dojango.spec ++++++ --- /var/tmp/diff_new_pack.QJjamG/_old 2011-11-25 10:13:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QJjamG/_new 2011-11-25 10:13:19.000000000 +0100 @@ -18,16 +18,14 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define mod_name dojango - -Name: python-%{mod_name} -Version: 0.5.2 +Name: python-dojango +Version: 0.5.4 Release: 0 Url: http://code.google.com/p/dojango/ Summary: App that helps you to use the client-side framework dojo License: BSD-3-Clause Group: Development/Languages/Python -Source: %{mod_name}-%{version}.tar.bz2 +Source: dojango-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel Requires: python-django @@ -47,11 +45,10 @@ - It makes the building of your own packed dojo release easier. %prep -%setup -q -n %{mod_name}-%{version} +%setup -q -n dojango-%{version} %build -export CFLAGS="%{optflags}" -python setup.py build +CFLAGS="%{optflags}" python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -62,6 +59,6 @@ %files %defattr(-,root,root,-) %doc README -%python_sitelib/%{mod_name}* +%{python_sitelib}/* %changelog ++++++ dojango-0.5.2.tar.bz2 -> dojango-0.5.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/PKG-INFO new/dojango-0.5.4/PKG-INFO --- old/dojango-0.5.2/PKG-INFO 2011-04-15 00:25:31.000000000 +0200 +++ new/dojango-0.5.4/PKG-INFO 2011-11-07 13:16:40.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: dojango -Version: 0.5.2 +Version: 0.5.4 Summary: Reusable django application that helps you to use the client-side framework dojo Home-page: http://code.google.com/p/dojango/ Author: Tobias von Klipstein diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/README new/dojango-0.5.4/README --- old/dojango-0.5.2/README 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/README 2011-11-07 08:10:21.000000000 +0100 @@ -8,4 +8,4 @@ For further documentation go to: -http://code.google.com/p/dojango/ +https://github.com/klipstein/dojango/wiki diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/__init__.py new/dojango-0.5.4/dojango/__init__.py --- old/dojango-0.5.2/dojango/__init__.py 2011-04-15 00:25:02.000000000 +0200 +++ new/dojango-0.5.4/dojango/__init__.py 2011-11-07 13:15:26.000000000 +0100 @@ -1,4 +1,4 @@ -VERSION = (0, 5, 2, 'final', 0) +VERSION = (0, 5, 4, 'final', 0) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/conf/settings.py new/dojango-0.5.4/dojango/conf/settings.py --- old/dojango-0.5.2/dojango/conf/settings.py 2011-04-15 00:25:02.000000000 +0200 +++ new/dojango-0.5.4/dojango/conf/settings.py 2011-11-07 08:10:21.000000000 +0100 @@ -4,7 +4,7 @@ DEBUG = getattr(settings, "DEBUG", False) DEFAULT_CHARSET = getattr(settings, 'DEFAULT_CHARSET', 'utf-8') -DOJO_VERSION = getattr(settings, "DOJANGO_DOJO_VERSION", "1.6.0") +DOJO_VERSION = getattr(settings, "DOJANGO_DOJO_VERSION", "1.6.1") DOJO_PROFILE = getattr(settings, "DOJANGO_DOJO_PROFILE", "google") DOJO_MEDIA_URL = getattr(settings, "DOJANGO_DOJO_MEDIA_URL", 'dojo-media') @@ -31,7 +31,7 @@ # - is_local_build: profile being a locally builded version _aol_versions = ('0.9.0', '1.0.0', '1.0.2', '1.1.0', '1.1.1', '1.2.0', '1.2.3', '1.3', '1.3.0', '1.3.1', '1.3.2', '1.4', '1.4.0', '1.4.1', '1.4.3', '1.5', '1.5.0', '1.6', '1.6.0') _aol_gfx_versions = ('0.9.0', '1.0.0', '1.0.2', '1.1.0', '1.1.1',) -_google_versions = ('1.1.1', '1.2', '1.2.0', '1.2.3', '1.3', '1.3.0', '1.3.1', '1.3.2', '1.4', '1.4.0', '1.4.1', '1.4.3', '1.5', '1.5.0', '1.6', '1.6.0') +_google_versions = ('1.1.1', '1.2', '1.2.0', '1.2.3', '1.3', '1.3.0', '1.3.1', '1.3.2', '1.4', '1.4.0', '1.4.1', '1.4.3', '1.5', '1.5.0', '1.6', '1.6.0', '1.6.1') DOJO_PROFILES = { 'google': {'base_url':(CDN_USE_SSL and 'https' or 'http') + '://ajax.googleapis.com/ajax/libs/dojo', 'use_xd':True, 'versions':_google_versions}, # google just supports version >= 1.1.1 'google_uncompressed': {'base_url':(CDN_USE_SSL and 'https' or 'http') + '://ajax.googleapis.com/ajax/libs/dojo', 'use_xd':True, 'uncompressed':True, 'versions':_google_versions}, @@ -52,7 +52,7 @@ # ============================================================================================= # general doc: http://dojotoolkit.org/book/dojo-book-0-9/part-4-meta-dojo/package-system-and-custom-builds # see http://www.sitepen.com/blog/2008/04/02/dojo-mini-optimization-tricks-with-the-dojo-toolkit/ for details -DOJO_BUILD_VERSION = getattr(settings, "DOJANGO_DOJO_BUILD_VERSION", '1.6.0') +DOJO_BUILD_VERSION = getattr(settings, "DOJANGO_DOJO_BUILD_VERSION", '1.6.1') # this is the default build profile, that is used, when calling "./manage.py dojobuild" # "./manage.py dojobuild dojango" would have the same effect DOJO_BUILD_PROFILE = getattr(settings, "DOJANGO_DOJO_BUILD_PROFILE", "dojango") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/contrib/auth/forms.py new/dojango-0.5.4/dojango/contrib/auth/forms.py --- old/dojango-0.5.2/dojango/contrib/auth/forms.py 1970-01-01 01:00:00.000000000 +0100 +++ new/dojango-0.5.4/dojango/contrib/auth/forms.py 2011-11-07 08:10:21.000000000 +0100 @@ -0,0 +1,19 @@ +from django.contrib.auth import forms as aforms +from django.utils.translation import ugettext_lazy as _ + +from dojango import forms + +class SetPasswordForm(aforms.SetPasswordForm): + """ + A form that lets a user change set his/her password without + entering the old password + """ + new_password1 = forms.CharField(label=_("New password"), widget=forms.PasswordInput) + new_password2 = forms.CharField(label=_("New password confirmation"), widget=forms.PasswordInput) + +class PasswordChangeForm(SetPasswordForm): + """ + A form that lets a user change his/her password by entering + their old password. + """ + old_password = forms.CharField(label=_("Old password"), widget=forms.PasswordInput) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/data/modelstore/stores.py new/dojango-0.5.4/dojango/data/modelstore/stores.py --- old/dojango-0.5.2/dojango/data/modelstore/stores.py 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/dojango/data/modelstore/stores.py 2011-11-07 08:10:21.000000000 +0100 @@ -433,8 +433,10 @@ # We don't want the client to be able to ask for a million records. # They can ask for less, but not more ... - if count == 'Infinity' or count > objects_per_query: + if count == 'Infinity' or int(count) > objects_per_query: count = objects_per_query + else: + count = int(count) objects = self.filter_objects(request, self.get_option('objects'), query_dict) objects = self.sort_objects(request, objects, sort_attr, descending) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/forms/fields.py new/dojango-0.5.4/dojango/forms/fields.py --- old/dojango-0.5.2/dojango/forms/fields.py 2011-04-15 00:25:02.000000000 +0200 +++ new/dojango-0.5.4/dojango/forms/fields.py 2011-11-07 08:10:21.000000000 +0100 @@ -6,8 +6,7 @@ from dojango.util import json_encode __all__ = ( - 'Field', 'DEFAULT_DATE_INPUT_FORMATS', 'DEFAULT_TIME_INPUT_FORMATS', # original django classes - 'DEFAULT_DATETIME_INPUT_FORMATS', 'MultiValueField', 'ComboField', # original django classes + 'Field', 'MultiValueField', 'ComboField', # original django classes 'DojoFieldMixin', 'CharField', 'ChoiceField', 'TypedChoiceField', 'IntegerField', 'BooleanField', 'FileField', 'ImageField', 'DateField', 'TimeField', 'DateTimeField', 'SplitDateTimeField', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/forms/formsets.py new/dojango-0.5.4/dojango/forms/formsets.py --- old/dojango-0.5.2/dojango/forms/formsets.py 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/dojango/forms/formsets.py 2011-11-07 08:10:21.000000000 +0100 @@ -70,5 +70,6 @@ def formset_factory(*args, **kwargs): """Formset factory function that uses the dojango BaseFormSet""" - kwargs["formset"] = BaseFormSet + if not kwargs.has_key("formset"): + kwargs["formset"] = BaseFormSet return django_formset_factory(*args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/forms/widgets.py new/dojango-0.5.4/dojango/forms/widgets.py --- old/dojango-0.5.2/dojango/forms/widgets.py 2011-04-15 00:25:02.000000000 +0200 +++ new/dojango-0.5.4/dojango/forms/widgets.py 2011-11-07 08:10:21.000000000 +0100 @@ -56,7 +56,7 @@ 'min_value':'constraints.min', 'max_value':'constraints.max', 'max_length':'maxLength', - #'max_digits':'maxDigits', + 'max_digits':'maxLength', 'decimal_places':'constraints.places', 'js_regex':'regExp', 'multiple':'multiple', @@ -419,6 +419,7 @@ 'required', 'help_text', 'decimal_places', + 'max_digits', ] class RangeBoundTextInput(NumberTextInput): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/management/commands/dojobuild.py new/dojango-0.5.4/dojango/management/commands/dojobuild.py --- old/dojango-0.5.2/dojango/management/commands/dojobuild.py 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/dojango/management/commands/dojobuild.py 2011-11-07 08:10:21.000000000 +0100 @@ -103,7 +103,7 @@ if settings.DOJO_BUILD_USED_VERSION >= '1.2.0': # since version 1.2.0 there is an additional commandline option that does the mini build (solved within js!) build_addons = "mini=true" - exe_command = 'cd %(buildscript_dir)s && %(executable)s version=%(version)s releaseName="%(version)s" releaseDir="%(release_dir)s" %(options)s %(build_addons)s' % \ + exe_command = 'cd "%(buildscript_dir)s" && %(executable)s version=%(version)s releaseName="%(version)s" releaseDir="%(release_dir)s" %(options)s %(build_addons)s' % \ {'buildscript_dir':buildscript_dir, 'executable':executable, 'version':version, @@ -120,7 +120,9 @@ exe_command = os.path.splitdrive(buildscript_dir)[0] + ' && ' + exe_command # do the build - os.system(exe_command) + exit_code = os.system(exe_command) + if exit_code: # != 0 + sys.exit(1) # dojobuild exits because of shrinksafe error if settings.DOJO_BUILD_USED_VERSION < '1.2.0': if minify or minify_extreme: self._dojo_mini_after_build() @@ -190,6 +192,7 @@ os.remove("%s/dojo/tests.js" % self.dojo_release_dir) except Exception, e: print e + sys.exit(1) # cleanup from above, refs #6616 shutil.move("%s/util/buildscripts/_copyright.txt" % self.dojo_base_dir, "%s/util/buildscripts/copyright.txt" % self.dojo_base_dir) shutil.move("%s/util/buildscripts/_build_notice.txt" % self.dojo_base_dir, "%s/util/buildscripts/build_notice.txt" % self.dojo_base_dir) @@ -268,6 +271,7 @@ pass except Exception, e: print e + sys.exit(1) DOJO_ZIP_SPECIAL = {'dojox': ['form', 'widget', 'grid']} # these modules will be zipped separately def _dojo_prepare_zipserve(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/middleware.py new/dojango-0.5.4/dojango/middleware.py --- old/dojango-0.5.2/dojango/middleware.py 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/dojango/middleware.py 2011-11-07 08:10:21.000000000 +0100 @@ -2,6 +2,7 @@ from django.conf import settings from django.http import HttpResponseServerError +from django.utils.encoding import smart_unicode from dojango.util import dojo_collector @@ -59,14 +60,15 @@ len(response.content) > 0: # just for html pages! dojo_type_re = re.compile('\sdojoType\s*\=\s*[\'\"]([\w\d\.\-\_]*)[\'\"]\s*') unique_dojo_modules = set(dojo_type_re.findall(response.content)) # we just need each module once - tail, sep, head = response.content.rpartition("</body>") - response.content = "%(tail)s%(script)s%(sep)s%(head)s" % { - 'tail':tail, - 'script':'<script type="text/javascript">\n%s\n</script>\n' % self._get_dojo_requires(unique_dojo_modules), - 'sep':sep, - 'head':head, - } + if len(unique_dojo_modules) > 0: + tail, sep, head = smart_unicode(response.content).rpartition("</body>") + response.content = "%(tail)s%(script)s%(sep)s%(head)s" % { + 'tail':tail, + 'script':'<script type="text/javascript">\n%s\n</script>\n' % self._get_dojo_requires(unique_dojo_modules), + 'sep':sep, + 'head':head, + } return response def _get_dojo_requires(self, dojo_modules): - return "\n".join([u"dojo.require(\"%s\");" % require for require in dojo_modules]) \ No newline at end of file + return "\n".join([u"dojo.require(\"%s\");" % require for require in dojo_modules]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dojango-0.5.2/dojango/util/__init__.py new/dojango-0.5.4/dojango/util/__init__.py --- old/dojango-0.5.2/dojango/util/__init__.py 2010-12-26 01:15:43.000000000 +0100 +++ new/dojango-0.5.4/dojango/util/__init__.py 2011-11-07 13:14:36.000000000 +0100 @@ -16,8 +16,11 @@ # we need it, if we want to serialize query- and model-objects # of google appengine within json_encode from google import appengine + # allow serialization of mongodb ObjectIds + from pymongo.objectid import ObjectId except: appengine = None + ObjectId = None try: # this is just available since django version 1.0 @@ -124,6 +127,8 @@ ret = _model(data) elif appengine and isinstance(data, appengine.ext.db.Model): ret = _googleModel(data) + elif ObjectId and isinstance(data, ObjectId): + ret = str(data) # here we need to encode the string as unicode (otherwise we get utf-16 in the json-response) elif isinstance(data, basestring): ret = unicode(data) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
