Commits

Bart Riepe committed 080f3b7 Merge

Merge with pep8-cleanup

  • Participants
  • Parent commits a846e6e, ff24db0

Comments (0)

Files changed (18)

+syntax: glob
+
+*.pyc
+*.log
+.DS_Store
+.idea

File .idea/.name

-emk_uploader

File .idea/dictionaries/Bart.xml

-<component name="ProjectDictionaryState">
-  <dictionary name="Bart" />
-</component>

File .idea/emk_uploader.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 2.7.2 (C:/Python27/python.exe)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

File .idea/encodings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

File .idea/inspectionProfiles/profiles_settings.xml

-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" />
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

File .idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectResources">
-    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.2.2 (C:/Python32/python.exe)" project-jdk-type="Python SDK" />
-</project>
-

File .idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/emk_uploader.iml" filepath="$PROJECT_DIR$/.idea/emk_uploader.iml" />
-    </modules>
-  </component>
-</project>
-

File .idea/scopes/scope_settings.xml

-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

File .idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="hg4idea" />
-  </component>
-</project>
-

File .idea/workspace.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="bea20a67-b43e-4a9d-9ff0-dae746769d63" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Classes.py" afterPath="$PROJECT_DIR$/Classes.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UploaderFrame.py.bak" afterPath="$PROJECT_DIR$/UploaderFrame.py.bak" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UploaderFrame.py" afterPath="$PROJECT_DIR$/UploaderFrame.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.ini" afterPath="$PROJECT_DIR$/config.ini" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uploaderInterface.wxg.bak" afterPath="$PROJECT_DIR$/uploaderInterface.wxg.bak" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uploaderInterface.wxg" afterPath="$PROJECT_DIR$/uploaderInterface.wxg" />
-    </list>
-    <ignored path="emk_uploader.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="FavoritesManager">
-    <favorites_list name="emk_uploader" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="UploaderFrame.py" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/UploaderFrame.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="191" column="58" selection-start="8578" selection-end="8578" vertical-scroll-proportion="0.4431818">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="emkUploader.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/emkUploader.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="20" column="0" selection-start="487" selection-end="487" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Classes.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Classes.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="35" selection-start="379" selection-end="379" vertical-scroll-proportion="62.56">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EndpointDialog.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/EndpointDialog.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="95" column="24" selection-start="3822" selection-end="3822" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="onlineEndpointDialog.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/onlineEndpointDialog.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="65" column="38" selection-start="2382" selection-end="2401" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="e#87#101#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="false" />
-    </FindUsagesManager>
-  </component>
-  <component name="Git.Settings">
-    <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
-    <option name="UPDATE_CHANGES_POLICY" value="STASH" />
-    <option name="LINE_SEPARATORS_CONVERSION" value="ASK" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="changedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/uploader.py" />
-        <option value="$PROJECT_DIR$/EndpointDialog.py" />
-        <option value="$PROJECT_DIR$/Classes.py" />
-        <option value="$PROJECT_DIR$/onlineEndpointDialog.py" />
-        <option value="$PROJECT_DIR$/UploaderFrame.py" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="width" value="1530" />
-    <option name="height" value="1040" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectReloadState">
-    <option name="STATE" value="0" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="emk_uploader" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="emk_uploader" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="emk_uploader" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="recentsLimit" value="5" />
-    <property name="options.lastSelected" value="reference.settingsdialog.IDE.editor.colors.General" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="options.searchVisible" value="true" />
-  </component>
-  <component name="PyConsoleOptionsProvider">
-    <option name="myPythonConsoleState">
-      <PyConsoleSettings />
-    </option>
-    <option name="myDjangoConsoleState">
-      <PyConsoleSettings />
-    </option>
-  </component>
-  <component name="RunManager" selected="Python.Run">
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <module name="emk_uploader" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="MULTIPROCESS" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Unittests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <module name="emk_uploader" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
-      <option name="PATTERN" value="" />
-      <option name="USE_PATTERN" value="false" />
-      <option name="PUREUNITTEST" value="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Doctests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <module name="emk_uploader" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
-      <option name="PATTERN" value="" />
-      <option name="USE_PATTERN" value="false" />
-      <method />
-    </configuration>
-    <configuration default="false" name="Run" type="PythonConfigurationType" factoryName="Python">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="C:/Python27/python.exe" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <module name="emk_uploader" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/emkUploader.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="MULTIPROCESS" value="false" />
-      <RunnerSettings RunnerId="PythonRunner" />
-      <ConfigurationWrapper RunnerId="PythonRunner" />
-      <method />
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Python.Run" />
-    </list>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false" />
-  <component name="SvnConfiguration" maxAnnotateRevisions="500">
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="mySSHConnectionTimeout" value="30000" />
-    <option name="mySSHReadTimeout" value="30000" />
-    <option name="LAST_MERGED_REVISION" />
-    <option name="MERGE_DRY_RUN" value="false" />
-    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
-    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
-    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
-    <option name="DETECT_NESTED_COPIES" value="true" />
-    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
-    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
-    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
-    <option name="FORCE_UPDATE" value="false" />
-    <configuration useDefault="false">C:\Users\Bart\AppData\Roaming\Subversion</configuration>
-    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="bea20a67-b43e-4a9d-9ff0-dae746769d63" name="Default" comment="" />
-      <created>1323265416849</created>
-      <updated>1323265416849</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1530" height="1040" extended-state="1" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.7414966" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22207084" sideWeight="0.7414966" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2585034" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962137" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
-    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
-    <option name="CHECK_NEW_TODO" value="true" />
-    <option name="myTodoPanelSettings">
-      <value>
-        <are-packages-shown value="false" />
-        <are-modules-shown value="false" />
-        <flatten-packages value="false" />
-        <is-autoscroll-to-source value="false" />
-      </value>
-    </option>
-    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
-    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
-    <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
-    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
-    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
-    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
-    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
-    <option name="SHORT_DIFF_HORISONTALLY" value="true" />
-    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
-    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
-    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
-    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
-    <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
-    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-    <option name="ACTIVE_VCS_NAME" />
-    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
-    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://C:/Python27/Lib/site-packages/wx-2.8-msw-unicode/wx/_core.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8007" column="8" selection-start="301542" selection-end="301542" vertical-scroll-proportion="0.33275563" />
-      </provider>
-    </entry>
-    <entry file="file://C:/Python27/Lib/ConfigParser.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="727" column="39" selection-start="26489" selection-end="26489" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://C:/Python27/Lib/genericpath.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="0" selection-start="782" selection-end="782" vertical-scroll-proportion="0.33333334" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/filereader.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/emkUploader.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="0" selection-start="487" selection-end="487" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/EndpointDialog.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="95" column="24" selection-start="3822" selection-end="3822" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Classes.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="35" selection-start="379" selection-end="379" vertical-scroll-proportion="62.56">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/onlineEndpointDialog.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="38" selection-start="2382" selection-end="2401" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#87#101#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/UploaderFrame.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="191" column="58" selection-start="8578" selection-end="8578" vertical-scroll-proportion="0.4431818">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="hg4idea.settings">
-    <option name="myCheckIncoming" value="false" />
-    <option name="myCheckOutgoing" value="false" />
-  </component>
-</project>
-
 import csv
 import httplib
 import os
-import pprint
-import threading
 import time
 import traceback
 import urllib
         self.PopupMenu(self.menu)
 
     def onExit(self, event):
-        self.parentApp.Quit();
+        self.parentApp.Quit()
 
 class DataGenerator():
     regionId = None
             else:
                 print "No data, not uploading"
         else:
-            print 'process: Not a marketProxy cache file, but '+str(function);
+            print 'process: Not a marketProxy cache file, but '+str(function)
 
     def upload(self):
         if self.endpoint.dataType == "EVE Marketeer & EVE Marketdata" and self.endpoint.uploadKey == '':
 
             blocks = urlparse(self.endpoint.url)
 
-            print 'upload: uploading to '+self.endpoint.url;
+            print 'upload: uploading to '+self.endpoint.url
 
             conn = httplib.HTTPConnection(blocks.netloc, timeout=10)
             try:
                     elif reason[:7] == '<error>':
                         result = "Upload Error: "+reason[7:-8]
                     else:
-                        result = "Upload unknown problem: "+reason;
+                        result = "Upload unknown problem: "+reason
 
             conn.close()
             return result

File Classes.pyc

Binary file removed.

File EndpointDialog.pyc

Binary file removed.

File MAC_README.rst

+How to Build for Mac OS
+=======================
+
+First, create a virtualenv.
+
+```
+mkvirtualenv uploader
+```
+
+Now, install wxpython, with the universal variant. This will also re-compile
+any dependencies as universal.
+
+```
+sudo port selfupdate
+sudo port upgrade --force --enforce-variants py27-wxpython python27 +universal
+git clone https://github.com/ntt/reverence.git
+cd reverence
+```
+
+Open up the included ``setup.py`` and replace the ``ext_modules`` kwarg
+to ``setup()`` with this:
+
+```
+    ext_modules = [Extension("reverence._blue", [
+        "src/blue/__init__.c",
+        "src/blue/marshal.c",
+        "src/blue/dbrow.c",
+        "src/blue/adler32.c",
+        ],
+        extra_compile_args = ['-m32', '-march=i386'],
+        extra_link_args = ['-m32', '-march=i386'],
+    )],
+```
+
+Now install reverence, then cd back up to your working dir and get pythonw set up:
+
+```
+arch -i386 python setup.py build install
+cd ..
+git clone https://github.com/gldnspud/virtualenv-pythonw-osx.git
+cd virtualenv-pythonw-osx
+python install_pythonw.py ~/.virtualenvs/uploader/
+cd ..
+```
+
+Open up ``config.ini`` and replace the old value for installation_0 with this:
+
+```
+installation_0 = /Users/gtaylor/Library/Application Support/EVE Online/p_drive/Local Settings/Application Data/CCP/EVE/c_program_files_ccp_eve_tranquility/
+```
+
+Now you're ready to run emk:
+
+```
+arch -i386 python emkUploader.py
+```

File UploaderFrame.py

 
     def installationAutodetectButtonClick(self, event): # wxGlade: UploaderFrame.<event_handler>
         del self.installations[:]
-        if (platform.system() == 'Windows'):
-            if (platform.release == 'XP'):
+        if platform.system() == 'Windows':
+            if platform.release == 'XP':
                 appdata = os.environ['appdata']
             else:
                 appdata = os.environ['localappdata']
             path = os.path.join(appdata, 'CCP', 'EVE')
         elif platform.system() == 'Linux':
             path = os.path.join(os.environ['HOME'], ".wine/drive_c/users", os.getlogin(), "Local Settings/Application Data/CCP/EVE/d_eve_tranquility")
-        elif (platform.system() == 'Darwin'):
-            path = os.path.expanduser('~/Library/Preferences/EVE Online Preferences/p_drive/Local Settings/Application Data/CCP/EVE')
+        elif platform.system() == 'Darwin':
+            path = os.path.expanduser('~/Library/Application Support/EVE Online/p_drive/Local Settings/Application Data/CCP/EVE/c_program_files_ccp_eve_tranquility/')
+        else:
+            path = None
 
-        if path == "":
+        if not path:
             print "paths empty"
         else:
             # check in c:\users\username\appdata\local\ccp\eve\ to find installation data
             # multiple clients are automatically detected
             for folder in os.listdir(path):
                 folder_base = os.path.join(path, folder)
+                print folder_base
                 folder_full = os.path.join(folder_base, 'cache', 'MachoNet', '87.237.38.200')
-                if (os.path.isdir(folder_full)): # path exists
+                if os.path.isdir(folder_full): # path exists
                     # any time eve updates their cache design they get a new version, which gets its own folder, so only use the highest numbered folder
                     self.Debug("find_default_paths: default "+str(folder_full))
                     versions = [ int(x) for x in os.listdir(folder_full) ]
             self.Debug("init_paths_full: checking "+installation.cacheFolder)
 
             folder = os.path.join(installation.cacheFolder, 'cache', 'MachoNet', '87.237.38.200')
-            if (os.path.isdir(folder)): # path exists
+            if os.path.isdir(folder): # path exists
                 # any time eve updates their cache design they get a new version, which gets its own folder, so only use the highest numbered folder
                 self.Debug("init_paths_full: checking "+str(folder))
                 versions = [ int(x) for x in os.listdir(folder) ]
                 versions.sort() # sorted ascending, but uses pop to get the last item
                 folder_cache = os.path.join(folder, str(versions.pop()), 'CachedMethodCalls')
                 self.Debug("init_paths_full: checking "+str(folder_cache))
-                if (os.path.isdir(folder_cache)):
+                if os.path.isdir(folder_cache):
                     self.Debug("setting versioned path: "+str(folder_cache))
                     installation.fullCacheFolder = folder_cache
 

File UploaderFrame.pyc

Binary file removed.
-[endpoints]
-endpoint_count = 3
-endpoint_0_name = EVE Marketeer
-endpoint_0_datatype = EVE Marketeer & EVE Marketdata
-endpoint_0_uploadkey = EMB4e2832255b59a
-endpoint_0_url = http://www.evemarketeer.com/api/upload
-endpoint_1_name = EVE Marketdata
-endpoint_1_datatype = EVE Marketeer & EVE Marketdata
-endpoint_1_uploadkey = z4b9zxuf3fjqqjh4
-endpoint_1_url = http://eve-marketdata.com/api/upload.php
-endpoint_2_name = EVE Central
-endpoint_2_datatype = EVE Central
-endpoint_2_uploadkey = 
-endpoint_2_url = http://eve-central.com/datainput.py/inputdata
-
-[installations]
-installation_count = 1
-installation_0 = C:\Users\Bart\AppData\Local\CCP\EVE\c_program_files_(x86)_ccp_eve_tranquility
-
-[settings]
-dont_delete_files = False
-check_new_version_on_startup = True
-delete_after_x = False
-x_minutes = 1
-
+[endpoints]
+endpoint_count = 4
+endpoint_0_name = EVE Marketeer
+endpoint_0_datatype = EVE Marketeer & EVE Marketdata
+endpoint_0_uploadkey = EMB4e2832255b59a
+endpoint_0_url = http://www.evemarketeer.com/api/upload
+endpoint_1_name = EVE Marketdata
+endpoint_1_datatype = EVE Marketeer & EVE Marketdata
+endpoint_1_uploadkey = z4b9zxuf3fjqqjh4
+endpoint_1_url = http://eve-marketdata.com/api/upload.php
+endpoint_2_name = EVE Central
+endpoint_2_datatype = EVE Central
+endpoint_2_uploadkey = 
+endpoint_2_url = http://eve-central.com/datainput.py/inputdata
+endpoint_3_name = Monster
+endpoint_3_datatype = EVE Marketeer & EVE Marketdata
+endpoint_3_uploadkey = 46
+endpoint_3_url = http://localhost:8080/api/upload/
+
+[installations]
+installation_count = 1
+installation_0 = /Users/gtaylor/Library/Application Support/EVE Online/p_drive/Local Settings/Application Data/CCP/EVE/c_program_files_ccp_eve_tranquility/
+
+[settings]
+dont_delete_files = False
+check_new_version_on_startup = True
+delete_after_x = False
+x_minutes = 1
+