Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

misc fixes #18

Closed
wants to merge 7 commits into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 7, 2013
  1. @gjhiggins

    fix deprecated call

    gjhiggins authored
    Okay for WebOb 1.1 and above, from install_requires
  2. @gjhiggins

    Travising

    gjhiggins authored
  3. @gjhiggins

    Hide inelegance

    gjhiggins authored
  4. @gjhiggins

    Superseded error message?

    gjhiggins authored
  5. @gjhiggins
  6. @gjhiggins

    actually use markdown

    gjhiggins authored
  7. @gjhiggins
This page is out of date. Refresh to see the latest.
View
9 .travis.yml
@@ -0,0 +1,9 @@
+language: python
+
+python:
+ - 2.6
+ - 2.7
+ - pypy
+
+script: python setup.py test
+
View
18 README.txt → README.md
@@ -1,19 +1,19 @@
Pylons
-++++++
+======
Pylons is a rapid web application development framework.
Full documentation is available online at http://pylonshq.com/docs/en/1.0/
+[![Build Status](https://travis-ci.org/gjhiggins/pylons.png)](https://travis-ci.org/gjhiggins/pylons)
+
Install
-=======
+-------
Installation instructions are at http://pylonshq.com/docs/en/1.0/gettingstarted/
If you want to install from source you can run the following command:
-.. code-block :: bash
-
$ python setup.py install
This will display a message and download setuptools if the module is not
@@ -21,32 +21,26 @@ already installed. It will then install Pylons and all its dependencies. You
may need root privileges to install setuptools.
Testing
-=======
+-------
To test the source distribution run the following command:
you will need to install Pylons as well some
additional tools.
-.. code-block :: bash
-
$ python setup.py test
This will install additional dependencies needed for the tests. As above, you
may need root privileges.
Documentation
-=============
+-------------
Generating documentation requires Sphinx:
-.. code-block :: bash
-
$ easy_install Sphinx
Then to build the documentation use the commands:
-.. code-block :: bash
-
$ cd pylons/docs/<lang>
$ make html
View
6 pylons/controllers/util.py
@@ -174,7 +174,7 @@ def index(self):
response.headers.pop('Content-Type', None)
response.headers.pop('Cache-Control', None)
response.headers.pop('Pragma', None)
- raise status_map[304]().exception
+ raise status_map[304]()
else:
log.debug("ETag didn't match, returning response object")
@@ -207,7 +207,7 @@ def abort(status_code=None, detail="", headers=None, comment=None):
comment=comment)
log.debug("Aborting request, status: %s, detail: %r, headers: %r, "
"comment: %r", status_code, detail, headers, comment)
- raise exc.exception
+ raise exc
def redirect(url, code=302):
@@ -221,4 +221,4 @@ def redirect(url, code=302):
"""
log.debug("Generating %s redirect" % code)
exc = status_map[code]
- raise exc(location=url).exception
+ raise exc(location=url.encode('utf-8'))
View
4 setup.py
@@ -1,6 +1,10 @@
import sys
try:
+ import multiprocessing
+except:
+ pass
+try:
from setuptools import setup, find_packages
except ImportError:
from ez_setup import use_setuptools
View
3  tests/test_units/test_decorator_validate.py
@@ -100,7 +100,8 @@ def test_network_validated(self):
def test_network_failed_validation_non_ascii(self):
response = self.post_response(action='network', new_network='Росси́я')
- assert 'That is not a valid URL' in response
+ # assert 'That is not a valid URL' in response, response
+ assert 'You must provide a full domain name' in response
assert 'Росси́я' in response
def test_recurse_validated(self):
Something went wrong with that request. Please try again.