Merge https://github.com/adambrenecki/python-guide

Kenneth Reitz · Kenneth Reitz · commit 810edb79c123 · 2011-05-12T02:44:44.000-04:00
Conflicts:
	docs/scenarios/gui.rst
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
@@ -21,25 +21,13 @@ Cocoa
 
 PyObjC
 ------
-PyObjC 2.0 is included in the default python installation of Mac OS X 10.5 Leopard.
-To install the latest version: ::
-    $ pip install pyobjc 
-or go to http://pyobjc.sourceforge.net/downloads.html
+*Note: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.*
 
 WXPython
 ::::::::
 Install (Stable)
 ----
 *Go to http://www.wxpython.org/download.php#stable and download the appropriate package for your OS.*
-The simplest method to test if it works is to attempt to import it. ::
-    Aarons-MacBook:docs aaron$ python
-    Python 2.6.6 (r266:84374, Aug 31 2010, 11:00:51) 
-    [GCC 4.0.1 (Apple Inc. build 5493)] on darwin
-    >>> import wx
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
-    ImportError: No module named wx
-If you don't get the above error, WXPython is installed.
 
 Gtk
 :::
