Merge lp:~mikemc/ubuntuone-client/cleanup-platform-constants into lp:ubuntuone-client

[Mike McCracken]

- Refactor platform/constants in ubuntuone-client ( LP: #989119 )

- Refactor platform/constants in ubuntuone-client ( LP: #989119 )

* Removed redundant files platform/windows/constants.py and platform/linux/constants.py.
platform/constants.py duplicates those files.

* Removed import of platform/windows/constants.py in platform/windows/__init__.py

* Did not create a platform/constants/ subpackage as in bug description, due to discussion on IRC that this is too small for a package.

* Tested on linux.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== removed file 'ubuntuone/platform/linux/constants.py'
--- ubuntuone/platform/linux/constants.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/linux/constants.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#
-# Author: Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Constants on the linux platform."""
-
-# To start hashing a file, no new hash request should arrive
-# for it within this amount of seconds:
-HASHQUEUE_DELAY = 0.5

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-04-27 20:39:54 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-05-01 05:52:18 +0000
@@ -36,7 +36,6 @@
 platform = "win32"
 
 
-import constants
 import event_logging
 import filesystem_notifications
 import launcher

=== removed file 'ubuntuone/platform/windows/constants.py'
--- ubuntuone/platform/windows/constants.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/constants.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#
-# Author: Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Constants on the windows platform."""
-
-# To start hashing a file, no new hash request should arrive
-# for it within this amount of seconds:
-HASHQUEUE_DELAY = 3.0