# HG changeset patch # User Rémi Cardona # Date 1397469273 -7200 # Node ID da7d341cca76784dfda36f8b10602144f4b0597f # Parent 990676d3f39f72d0380243faea7634e87b95a058 an URL -> a URL diff -r 990676d3f39f -r da7d341cca76 cwctl.py --- a/cwctl.py Tue Apr 01 13:57:25 2014 +0200 +++ b/cwctl.py Mon Apr 14 11:54:33 2014 +0200 @@ -847,7 +847,7 @@ in batch mode. By default it will connect to a local instance using an in memory - connection, unless an URL to a running instance is specified. + connection, unless a URL to a running instance is specified. Arguments after bare "--" string will not be processed by the shell command You can use it to pass extra arguments to your script and expect for diff -r 990676d3f39f -r da7d341cca76 entities/adapters.py --- a/entities/adapters.py Tue Apr 01 13:57:25 2014 +0200 +++ b/entities/adapters.py Mon Apr 14 11:54:33 2014 +0200 @@ -166,7 +166,7 @@ __abstract__ = True def download_url(self, **kwargs): # XXX not really part of this interface - """return an url to download entity's content""" + """return a URL to download entity's content""" raise NotImplementedError def download_content_type(self): diff -r 990676d3f39f -r da7d341cca76 req.py --- a/req.py Tue Apr 01 13:57:25 2014 +0200 +++ b/req.py Mon Apr 14 11:54:33 2014 +0200 @@ -279,7 +279,7 @@ return u'%s%s?%s' % (base_url, path, self.build_url_params(**kwargs)) def build_url_params(self, **kwargs): - """return encoded params to incorporate them in an URL""" + """return encoded params to incorporate them in a URL""" args = [] for param, values in kwargs.iteritems(): if not isinstance(values, (list, tuple)): diff -r 990676d3f39f -r da7d341cca76 view.py --- a/view.py Tue Apr 01 13:57:25 2014 +0200 +++ b/view.py Mon Apr 14 11:54:33 2014 +0200 @@ -502,7 +502,7 @@ """simple mixin for reloadable parts of UI""" def user_callback(self, cb, args, msg=None, nonify=False): - """register the given user callback and return an url to call it ready to be + """register the given user callback and return a URL to call it ready to be inserted in html """ self._cw.add_js('cubicweb.ajax.js') diff -r 990676d3f39f -r da7d341cca76 web/component.py --- a/web/component.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/component.py Mon Apr 14 11:54:33 2014 +0200 @@ -448,7 +448,7 @@ return domid(self.__regid__) + unicode(self.entity.eid) def lazy_view_holder(self, w, entity, oid, registry='views'): - """add a holder and return an url that may be used to replace this + """add a holder and return a URL that may be used to replace this holder by the html generate by the view specified by registry and identifier. Registry defaults to 'views'. """ diff -r 990676d3f39f -r da7d341cca76 web/data/cubicweb.ajax.js --- a/web/data/cubicweb.ajax.js Tue Apr 01 13:57:25 2014 +0200 +++ b/web/data/cubicweb.ajax.js Mon Apr 14 11:54:33 2014 +0200 @@ -377,7 +377,7 @@ /** * .. function:: loadRemote(url, form, reqtype='GET', sync=false) * - * Asynchronously (unless `sync` argument is set to true) load an url or path + * Asynchronously (unless `sync` argument is set to true) load a URL or path * and return a deferred whose callbacks args are decoded according to the * Content-Type response header. `form` should be additional form params * dictionary, `reqtype` the HTTP request type (get 'GET' or 'POST'). diff -r 990676d3f39f -r da7d341cca76 web/data/cubicweb.htmlhelpers.js --- a/web/data/cubicweb.htmlhelpers.js Tue Apr 01 13:57:25 2014 +0200 +++ b/web/data/cubicweb.htmlhelpers.js Mon Apr 14 11:54:33 2014 +0200 @@ -64,7 +64,7 @@ /** * .. function:: asURL(props) * - * builds an url from an object (used as a dictionary) + * builds a URL from an object (used as a dictionary) * * >>> asURL({'rql' : "RQL", 'x': [1, 2], 'itemvid' : "oneline"}) * rql=RQL&vid=list&itemvid=oneline&x=1&x=2 diff -r 990676d3f39f -r da7d341cca76 web/formwidgets.py --- a/web/formwidgets.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/formwidgets.py Mon Apr 14 11:54:33 2014 +0200 @@ -925,7 +925,7 @@ class EditableURLWidget(FieldWidget): - """Custom widget to edit separatly an url path / query string (used by + """Custom widget to edit separatly a URL path / query string (used by default for the `path` attribute of `Bookmark` entities). It deals with url quoting nicely so that the user edit the unquoted value. diff -r 990676d3f39f -r da7d341cca76 web/views/__init__.py --- a/web/views/__init__.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/views/__init__.py Mon Apr 14 11:54:33 2014 +0200 @@ -103,7 +103,7 @@ def linksearch_select_url(req, rset): - """when searching an entity to create a relation, return an url to select + """when searching an entity to create a relation, return a URL to select entities in the given rset """ req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) diff -r 990676d3f39f -r da7d341cca76 web/views/basecontrollers.py --- a/web/views/basecontrollers.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/views/basecontrollers.py Mon Apr 14 11:54:33 2014 +0200 @@ -92,7 +92,7 @@ def publish(self, rset=None): """log in the instance""" path = self._cw.form.get('postlogin_path', '') - # redirect expect an url, not a path. Also path may contains a query + # redirect expect a URL, not a path. Also path may contains a query # string, hence should not be given to _cw.build_url() raise Redirect(self._cw.base_url() + path) @@ -110,7 +110,7 @@ # anonymous connection is allowed and the page will be displayed or # we'll be redirected to the login form msg = self._cw._('you have been logged out') - # force base_url so on dual http/https configuration, we generate an url + # force base_url so on dual http/https configuration, we generate a URL # on the http version of the site return self._cw.build_url('view', vid='loggedout', base_url=self._cw.vreg.config['base-url']) diff -r 990676d3f39f -r da7d341cca76 web/views/tableview.py --- a/web/views/tableview.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/views/tableview.py Mon Apr 14 11:54:33 2014 +0200 @@ -1065,9 +1065,9 @@ self.w(u'\n') def page_navigation_url(self, navcomp, path, params): - """Build an url to the current view using the attributes + """Build a URL to the current view using the attributes - :param navcomp: a NavigationComponent to call an url method on. + :param navcomp: a NavigationComponent to call a URL method on. :param path: expected to be json here? :param params: params to give to build_url method diff -r 990676d3f39f -r da7d341cca76 web/views/urlpublishing.py --- a/web/views/urlpublishing.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/views/urlpublishing.py Mon Apr 14 11:54:33 2014 +0200 @@ -97,7 +97,7 @@ self.evaluators = sorted(evaluators, key=lambda x: x.priority) def process(self, req, path): - """Given an url (essentialy caracterized by a path on the + """Given a URL (essentialy caracterized by a path on the server, but additional information may be found in the request object), return a publishing method identifier (e.g. controller) and an optional result set. diff -r 990676d3f39f -r da7d341cca76 web/views/xmlrss.py --- a/web/views/xmlrss.py Tue Apr 01 13:57:25 2014 +0200 +++ b/web/views/xmlrss.py Mon Apr 14 11:54:33 2014 +0200 @@ -185,7 +185,7 @@ __select__ = is_instance('Any') def rss_feed_url(self): - """return an url to the rss feed for this entity""" + """return a URL to the rss feed for this entity""" return self.entity.absolute_url(vid='rss')