Commit Graph

1294 Commits

Author SHA1 Message Date
Vincent Zee 12dc0651fc Fix bad url. 2015-02-28 21:25:07 +01:00
Ian Cordasco da5d9d3d1b Merge pull request #519 from vishalsodani/master
virtualenvwrapper-win
2015-02-21 12:15:27 -06:00
Vishal Sodani 4ad53a4916 Use virtualwrapper-win on windows 2015-02-21 22:02:00 +05:30
Ian Cordasco e42e21fce0 Merge pull request #515 from mplewis/improve_json_section
Improve json section
2015-02-15 08:57:20 -06:00
Ian Cordasco 48361b5ac1 Merge pull request #517 from mtunique/patch-1
The latest version of Mac OS X is Yosemite.
2015-02-15 08:55:57 -06:00
Tao Meng 938b9325fa Update osx.rst 2015-02-12 13:16:47 +08:00
Matthew Lewis f6d503dd90 Revert "Add info on working with file objects"
This reverts commit 2e2d70ca9b.
2015-02-11 15:18:04 -06:00
Ian Cordasco 651129ade7 Merge pull request #516 from eikonomega/patch-1
Update logging.rst
2015-02-10 21:24:29 -06:00
Michael Dunn 2b15ec8af2 Update logging.rst
Removed whitespace in violation of PEP 8 and aligned lines.
2015-02-10 21:06:36 -05:00
Michael Dunn 86d29a3c77 Update logging.rst
The name of a dictionary key `root` was not properly enclosed in quotes, which results in a syntax error when people copy this code.

Thanks!
2015-02-10 18:16:14 -05:00
Michael Dunn 4ffb7ff3d8 Update logging.rst
The PEP referenced for configuring logging via - '319' should be '391'.
Just a simple fix.
2015-02-10 17:15:18 -05:00
Matthew Lewis 2e2d70ca9b Add info on working with file objects 2015-02-05 14:03:18 -06:00
Matthew Lewis ecc570d1c4 Improve wording of intro paragraph 2015-02-05 14:03:06 -06:00
Matthew Lewis 4fbc739be7 Add details on how to use simplejson 2015-02-05 13:57:28 -06:00
Matthew Lewis fc0fa67496 Merge pull request #1 from kennethreitz/master
Update to match master
2015-02-05 13:53:56 -06:00
Ian Cordasco 0f797099e1 Change logging_config extension to ini 2015-01-18 09:59:38 -06:00
Ian Cordasco c4d63d601f Merge branch 'pr/511' 2015-01-18 09:59:02 -06:00
Ian Cordasco f1e196a73f Commit last few necessary edits
These were all previously ignored in the last two pull requests.
2015-01-18 09:58:33 -06:00
Sam Clift 37ed5fc40a update based on PR feedback 2015-01-18 14:22:30 +00:00
Ian Cordasco cb1ddc6338 Merge pull request #512 from tanyaschlusser/master
Logging section
2015-01-17 21:52:45 -06:00
Tanya Schlusser df7a22568b Italic pro/con to bold, and '--' to colon after the pro/con 2015-01-17 21:43:22 -06:00
Tanya Schlusser 0c1551ae85 Added pro / con bullets to the list of ways to configure a logger 2015-01-17 21:09:52 -06:00
Tanya Schlusser 1cfb637cb1 Removed a stray capitalization and improved the grammar in the 'print' vs 'logging' section 2015-01-17 21:05:56 -06:00
Tanya Schlusser 7c37ec8396 Modified the new writing/logging.rst according to comments on the initial pull request 2015-01-17 20:59:53 -06:00
Tanya Schlusser 95ecb66c96 Added the logging section after the testing section in the Writing page 2015-01-17 11:56:16 -06:00
Tanya Schlusser 7ff1d0006f First attemt at a section on logging. 2015-01-17 11:55:26 -06:00
Sam Clift 332fdcd6f1 arrays to lists 2015-01-14 15:19:24 +00:00
Sam Clift f5ee4e207a Improvements to the JSON section
Thanks to https://github.com/mplewis
2015-01-14 15:09:50 +00:00
Ian Cordasco 4db76aac5b Merge pull request #510 from mcagl/patch-1
Update cli.rst
2015-01-13 19:35:06 -06:00
Mark fa307c2141 Update cli.rst
Fixed Cliff's documentation link, as the ReadTheDocs one is not working.
2015-01-14 02:31:36 +01:00
kennethreitz de9c3700e0 Merge pull request #507 from royka/add_json_section
add initial JSON section
2015-01-09 13:38:07 -05:00
Ian Cordasco 33c5a0fb84 Merge pull request #509 from grdryn/patch-1
Fix minor type in tests.rst: is -> in
2015-01-05 08:01:02 -06:00
Gerard Ryan aa951a138d Fix minor type in tests.rst: is -> in 2015-01-05 12:08:51 +00:00
Sam Clift 49988bf59c add initial JSON section 2014-12-11 15:31:31 +00:00
Ian Cordasco 417afdcfd9 Merge pull request #505 from originalankur/master
Added a importpython weekly newsletter to the listing
2014-12-08 23:14:03 -06:00
ankur 082203fd90 Appended the Import Python Newsletter listing to the news section 2014-12-09 10:38:46 +05:30
ankur 459a7f2397 Added a importpython weekly newsletter to the listing 2014-12-09 01:03:07 +05:30
Ian Cordasco 975a7e694b Merge pull request #501 from webmaven/master
Added section on Chameleon templating, for Issue #382
2014-12-07 14:14:52 -06:00
Michael Bernstein 53bf93d767 A bit more editing and cleanup of the Chameleon section. 2014-12-07 13:43:48 -06:00
Michael Bernstein c04def9e05 Expanded and edited the Chameleon section. 2014-12-07 11:43:01 -06:00
Ian Cordasco 126d874a26 Merge pull request #500 from wonderb0lt/more-orms-in-database-section
Added peewee, PonyORM and SQLObject to the databases section
2014-12-07 07:48:02 -06:00
Ian Cordasco 3c56e57cab Merge pull request #503 from clebio/master
Installation instructions don't explicitly state using Terminal
2014-12-07 07:46:32 -06:00
Ian Cordasco 85faaee29c Merge pull request #504 from mbren/dev
copy edits
2014-12-07 07:45:36 -06:00
Mary Brennan db1a94fd43 copy edits 2014-12-06 11:55:30 -08:00
Caleb Hyde dcecd4127e Revert removal of user prompt; Don't prescribe which emulator to use 2014-12-05 11:19:25 -06:00
Caleb Hyde 0f070bf3a7 Restructured Text formatting, not Markdown 2014-12-05 09:55:00 -06:00
Caleb Hyde 0559d84aca Minor formatting fix 2014-12-05 09:50:16 -06:00
Caleb Hyde 6abba86969 Explicitly state Terminal; update link to Homebrew 2014-12-05 09:47:26 -06:00
Ian Cordasco 4dadbdc10f Merge pull request #502 from helenst/virtualenvwrapper-link
Reference virtualenvwrapper from linux install page: Refs #469
2014-12-04 16:22:25 -06:00
Helen ST e9eb5da170 Reference virtualenvwrapper from linux install page: Refs #469 2014-12-04 18:51:43 +00:00