Import errors

File icon

Desktop.py

@@ -10,7 +10,6 @@ import wx
 if hasattr(sys, 'frozen'):
     import libs
     base_path = os.path.dirname(os.path.dirname(os.path.abspath(libs.__file__)))
-    print base_path
 else:
     base_path = os.path.dirname(os.path.abspath(__file__))
 
@@ -143,7 +142,7 @@ class CouchPotatoApp(wx.App, SoftwareUpdate):
         # Updater
         base_url = 'http://couchpota.to/updates/'
         self.InitUpdates(base_url, base_url + 'changelog.html',
-                         icon = wx.Icon('icon.ico'))
+                         icon = wx.Icon('icon.png'))
 
         self.frame = MainFrame(self)
         self.frame.Bind(wx.EVT_CLOSE, self.onClose)

installer.iss

@@ -1,5 +1,5 @@
 #define MyAppName "CouchPotato"
-#define MyAppVer GetFileVersion("./dist/"+MyAppName+".exe")
+#define MyAppVer "0.5"
 
 [Setup]
 AppName={#MyAppName}
@@ -7,14 +7,15 @@ AppVersion={#MyAppVer}
 AppVerName={#MyAppName}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-UninstallDisplayIcon={app}\icon.ico
+UninstallDisplayIcon=./icon.ico
+SetupIconFile=./icon.ico
 OutputDir=./dist
 OutputBaseFilename={#MyAppName}-{#MyAppVer}.win32.installer
 AppPublisher=Your Mom
 AppPublisherURL=http://couchpota.to
 
 [Files]
-Source: "./*"; DestDir: "{app}"
+Source: "./dist/{#MyAppName}-{#MyAppVer}.win32/*"; Flags: recursesubdirs; DestDir: "{app}" 
 
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppName}.exe"

setup.py

@@ -45,6 +45,8 @@ if sys.platform == "win32":
             'xml.etree.cElementTree',
             'xml.dom',
             'xml.dom.minidom',
+            'netrc',
+            'csv',
         ],
         skip_archive = 1,
     )
@@ -70,10 +72,12 @@ elif sys.platform == "darwin":
             'xml.etree.cElementTree',
             'xml.dom',
             'xml.dom.minidom',
+            'netrc',
+            'csv',
         ],
     )
     exeICON = None
-    DATA_FILES = ['icon.ico']
+    DATA_FILES = ['icon.png']
 
 # Common
 NAME = "CouchPotato"