Code Camp LA 2014 updates

patrickwolf · patrickwolf · commit 74ffc6fbca81 · 2014-11-15T15:46:05.000-08:00
diff --git a/intro/__init__.py b/intro/__init__.py
diff --git a/intro/k_references.py b/intro/k_references.py
@@ -9,7 +9,7 @@
 print "\n--- numbers ---"
 aint = 5
 bint = aint
-print "%s,%s | id %s,%s" % (aint, bint, id(aint), id(bint))  # result 6  -  5
+print "%s,%s | id %s,%s" % (aint, bint, id(aint), id(bint))  # result 5  -  5
 aint = 6
 print "%s,%s | id %s,%s" % (aint, bint, id(aint), id(bint))  # result 6  -  5
 
diff --git a/intro/o_control_structures.py b/intro/o_control_structures.py
@@ -10,9 +10,9 @@
 # else:
 #     statements
 # ----------------------
+
 print "\n--- if ---"
-if ((10 == 5 + 5 or 20 == 10 + 10) and  
-    True):
+if ((10 == 5 + 5 or 20 == 10 + 10) and True):
     print "correct"
 elif 10 == 20:
     print "this is wrong"
diff --git a/intro/t_functions.py b/intro/t_functions.py
@@ -21,6 +21,7 @@ def add(aint, bint=0, cint=None):
 print "\n--- add ---"
 print add.__doc__
 print add(4)
+print add(4, 2, 5)
 print add(3, bint=1, cint=15)
 print add(10, cint=25)
 # ---------------------------
diff --git a/intro/u_classes.py b/intro/u_classes.py
@@ -9,12 +9,16 @@ class Vehicle(object):
 
     def __init__(self, name):
         self.name = name
+   
+    def __str__(self, *args, **kwargs):
+        return "Vehicle class" + self.name
+        # return object.__str__(self, *args, **kwargs)
         
-    def move(self, distance = 1):
+    def move(self, distance=1):
         raise NotImplementedError()
     
     def capabilities(self):
-        return ["moveable",]
+        return ["moveable", ]
 
 # ---------------------------
 # inheritance
@@ -23,23 +27,24 @@ def capabilities(self):
 class Car(Vehicle):
 
     def __init__(self, make, name):
-        #Call base class constructor
+        # Call base class constructor
         Vehicle.__init__(self, name)
         self.make = make
     
-    def move(self, distance = 1):   # overriding base class method
+    def move(self, distance=1):  # overriding base class method
         print "%s-%s moved %d feet" % (self.make, self.name, distance)
  
     def capabilities(self):
-        parent_capabilities = Vehicle.capabilities(self)    # super method call
-        my_capabilities =["fuel-using","transporter"]
+        parent_capabilities = Vehicle.capabilities(self)  # super method call
+        my_capabilities = ["fuel-using", "transporter"]
         return parent_capabilities + my_capabilities
 
         
 # ---------------------------
 # Instantiate no new needed
 # ---------------------------
 car = Car("Mercedes", "SL500")
+print car
 
 # ---------------------------
 # access methods with . notation
@@ -50,4 +55,4 @@ def capabilities(self):
 # ---------------------------
 # access properties with . notation
 # ---------------------------
-print car.name
+print car.name
diff --git a/intro/x_modules/main.py b/intro/x_modules/main.py
@@ -1,7 +1,7 @@
 '''
 @summary: Python Intro - Modules
 namespace, reuse
-pkg_tools is a package which is compare able to a self contained library with its own name space
+pkg_tools is a package which is compareable to a self contained library with its own name space
 '''
 from pprint import pprint
 
@@ -14,7 +14,7 @@
 pprint (sys.path)
 
 import os
-# this path is always added to the sys.path search list
+# this path is always adds to the sys.path search list
 print os.environ["PYTHONPATH"]
 
 # ---------------------------
@@ -34,7 +34,7 @@
 # different ways to import a package into the namespace
 # ---------------------------
 print "\n--- namespace packages ---"
-lst = [1,2,3,1,2,3,4]
+lst = [1, 2, 3, 1, 2, 3, 4]
 import pkg_tools.mod_lists
 print pkg_tools.mod_lists.get_unique_list(lst)
 
@@ -48,5 +48,6 @@
 print getunique(lst)
 
 
+# Only exectued when this is the startup script
 if __name__ == '__main__':
-    pass
+    pass
diff --git a/intro/y_packages/__init__.py b/intro/y_packages/__init__.py
diff --git a/intro/y_packages/file1.py b/intro/y_packages/file1.py
@@ -0,0 +1,19 @@
+'''
+@summary: Python Intro - Importing Packages
+'''
+
+import package.module1
+package.module1.Module1()
+
+from package.module1 import Module1
+Module1()
+
+from package.subpackage.submodule1 import SubModule1 
+SubModule1()
+
+from package import *
+module1.Module1()
+module2.Module2()
+
+if __name__ == '__main__':
+    pass
diff --git a/intro/y_packages/package/__init__.py b/intro/y_packages/package/__init__.py
@@ -0,0 +1,4 @@
+# To expose multiple submodules when * is used
+# "from package.subpackage import *" 
+
+__all__ = ['module1', 'module2']
diff --git a/intro/y_packages/package/module1.py b/intro/y_packages/package/module1.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class Module1(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages/package/module2.py b/intro/y_packages/package/module2.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class Module2(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages/package/subpackage/__init__.py b/intro/y_packages/package/subpackage/__init__.py
@@ -0,0 +1,5 @@
+
+# To expose multiple submodules when * is used
+# "from package.subpackage import *" 
+
+__all__ = ['submodule1', 'submodule2']
diff --git a/intro/y_packages/package/subpackage/submodule1.py b/intro/y_packages/package/subpackage/submodule1.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class SubModule1(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages/package/subpackage/submodule2.py b/intro/y_packages/package/subpackage/submodule2.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class SubModule2(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages_self_contained/file1.py b/intro/y_packages_self_contained/file1.py
@@ -0,0 +1,12 @@
+'''
+@summary: Python Intro - Self contained packages
+'''
+import package_self_contained
+
+package_self_contained.Module1()
+package_self_contained.Module2()
+package_self_contained.subpackage.SubModule1()
+package_self_contained.subpackage.SubModule2()
+
+if __name__ == '__main__':
+    pass
diff --git a/intro/y_packages_self_contained/package_self_contained/__init__.py b/intro/y_packages_self_contained/package_self_contained/__init__.py
@@ -0,0 +1,3 @@
+from module1 import Module1
+from module2 import Module2
+import subpackage
diff --git a/intro/y_packages_self_contained/package_self_contained/module1.py b/intro/y_packages_self_contained/package_self_contained/module1.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class Module1(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages_self_contained/package_self_contained/module2.py b/intro/y_packages_self_contained/package_self_contained/module2.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class Module2(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages_self_contained/package_self_contained/subpackage/__init__.py b/intro/y_packages_self_contained/package_self_contained/subpackage/__init__.py
@@ -0,0 +1,2 @@
+from submodule1 import SubModule1
+from submodule2 import SubModule2
diff --git a/intro/y_packages_self_contained/package_self_contained/subpackage/submodule1.py b/intro/y_packages_self_contained/package_self_contained/subpackage/submodule1.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class SubModule1(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro/y_packages_self_contained/package_self_contained/subpackage/submodule2.py b/intro/y_packages_self_contained/package_self_contained/subpackage/submodule2.py
@@ -0,0 +1,16 @@
+'''
+Created on Nov 15, 2014
+
+@author: patrick
+'''
+
+class SubModule2(object):
+    '''
+    classdocs
+    '''
+
+    def __init__(self):
+        '''
+        Constructor
+        '''
+        print __name__
diff --git a/intro_image_downloader/0_install.txt b/intro_image_downloader/0_install.txt
@@ -0,0 +1,20 @@
+--- DOWNLOAD PACKAGE MANAGER ---
+: https://bootstrap.pypa.io/get-pip.py
+
+--- INSTALL PACKAGE MANAGER (DOS SHELL) ---
+>SET PATH=%PATH%;C:\Python27x64;C:\Python27x64\Scripts
+>python.exe get-pip.py
+Downloading/unpacking pip
+Downloading/unpacking setuptools
+Installing collected packages: pip, setuptools
+Successfully installed pip setuptools
+Cleaning up...
+
+--- INSTALL VIRTUAL ENVIRONMENTS PACKAGE ---
+>pip.exe install virtualenv
+Downloading/unpacking virtualenv
+Installing collected packages: virtualenv
+Successfully installed virtualenv
+Cleaning up...
+
+--- DONE ---
diff --git a/intro_image_downloader/0_virtualenv.txt b/intro_image_downloader/0_virtualenv.txt
@@ -0,0 +1,32 @@
+--- CREATE VIRTUAL ENVIRONMENT ---
+SET PATH=%PATH%;C:\Python27x64;C:\Python27x64\Scripts
+>mkdir C:\Python27x64\venv
+>cd C:\Python27x64\venv
+
+>virtualenv vdev
+New python executable in vdev\Scripts\python.exe
+Installing setuptools, pip...done.
+
+
+
+--- ACTIVATE AND USE VIRTUAL ENVIRONMENT ---
+\venv>vdev\Scripts\activate
+
+
+
+--- INSTALL PACKAGE INTO VIRTUAL ENVIRONMENT ---
+(vdev) \venv>pip install beautifulsoup4
+Downloading/unpacking beautifulsoup4
+  Downloading BeautifulSoup-3.2.1.tar.gz
+  Running setup.py (path:\venv\vdev\build\beautifulsoup\setup.py) egg_info for package beautifulsoup
+
+Installing collected packages: beautifulsoup
+  Running setup.py install for beautifulsoup
+
+Successfully installed beautifulsoup
+Cleaning up...
+
+
+
+--- DEACTIVATE VIRTUAL ENVIRONMENT ---
+> deactivate
diff --git a/intro_image_downloader/README.md b/intro_image_downloader/README.md
@@ -4,5 +4,6 @@ image-downloader
 A sample how easy it is to download images from the web in Python
 
 Requirements:
-Python 2.7.5
-BeautifulSoup4 (pip install bs4)
+Python 2.7.x (https://www.python.org/ftp/python/2.7.8/python-2.7.8.msi)
+BeautifulSoup4 (pip install beautifulsoup4)
+See 0_install.txt and 0_virtualenv.txt
diff --git a/intro_image_downloader/img_downloader.py b/intro_image_downloader/img_downloader.py
@@ -48,7 +48,11 @@ def main(argv=None):
 if __name__ == "__main__":
     # sample call: python img_downloader.py -u http://www.pixomondo.com/wp/?page_id=43 -d c:\temp\e
     argv = sys.argv[1:]
-    if False:
+    if not argv:
+        print "no args provided. doing testing"
         # needs to be a list as it would come in as a list from the command line as parameters
         argv = ["-u", "http://www.pixomondo.com/wp/?page_id=43", "-d", r"c:\temp\img"]
+        argv = ["-u", "http://www.picsearch.com/index.cgi?q=movies", "-d", r"c:\temp\img"]
+        argv = ["-u", "http://www.flickr.com/search/?q=mountains", "-d", r"c:\temp\img"]
+
     sys.exit(main(argv))
diff --git a/intro_image_downloader/tools/extrac_images_test.py b/intro_image_downloader/tools/extrac_images_test.py
diff --git a/intro_image_downloader/tools/extract_images.py b/intro_image_downloader/tools/extract_images.py
