Merge lp:~nataliabidart/magicicada-server/move-local-lib-src into lp:magicicada-server

[Natalia Bidart]

- Move owned source code from lib/ to src/. Ensure to replace old folders with links.
- Fixed lint issues from stuff coming from lib/.

[Natalia Bidart (nataliabidart)]

Only code moved from lib/ to src/ as agreed with Facundo on IRC.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-09-04 19:32:02 +0000
+++ Makefile	2015-09-05 01:20:53 +0000
@@ -108,7 +108,7 @@
 raw-test:
 	./test $(TESTFLAGS)
 
-test: sourcedeps clean lint version start-base start-dbus raw-test stop
+test: lint sourcedeps clean version start-base start-dbus raw-test stop
 
 ci-test:
 	$(MAKE) test TESTFLAGS="-1 $(TESTFLAGS)"

=== added symlink 'lib/config.py'
=== target is u'../src/config.py'
=== added symlink 'lib/metrics'
=== target is u'../src/metrics/'
=== added symlink 'lib/ubuntuone/monitoring'
=== target is u'../../src/monitoring/'
=== removed directory 'lib/ubuntuone/storage/tests'
=== removed file 'lib/ubuntuone/storage/tests/__init__.py'
--- lib/ubuntuone/storage/tests/__init__.py	2015-08-05 13:10:02 +0000
+++ lib/ubuntuone/storage/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# Copyright 2008-2015 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# For further info, check  http://launchpad.net/filesync-server
-
-"""Loads and executes the tests in the module."""

=== added symlink 'lib/ubuntuone/txutils'
=== target is u'../../src/txutils/'
=== added symlink 'lib/utilities'
=== target is u'../src/utilities/'
=== renamed file 'lib/config.py' => 'src/config.py'
=== renamed directory 'lib/metrics' => 'src/metrics'
=== renamed directory 'lib/ubuntuone/monitoring' => 'src/monitoring'
=== renamed directory 'lib/ubuntuone/storage/tests/integration' => 'src/server/integration'
=== renamed file 'lib/ubuntuone/storage/rhashlib.py' => 'src/server/rhashlib.py'
=== renamed file 'lib/ubuntuone/storage/rzlib.py' => 'src/server/rzlib.py'
--- lib/ubuntuone/storage/rzlib.py	2015-08-05 13:10:02 +0000
+++ src/server/rzlib.py	2015-09-05 01:20:53 +0000
@@ -40,26 +40,26 @@
 
 
 # from inflate.h
-#/*
+# /*
 #     gzip header information passed to and from zlib routines.  See RFC 1952
-#  for more details on the meanings of these fields.
-#*/
-#typedef struct gz_header_s {
-#    int     text;       /* true if compressed data believed to be text */
-#    uLong   time;       /* modification time */
-#    int     xflags;     /* extra flags (not used when writing a gzip file) */
-#    int     os;         /* operating system */
-#    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-#    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-#    uInt    extra_max;  /* space at extra (only when reading header) */
-#    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-#    uInt    name_max;   /* space at name (only when reading header) */
-#    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-#    uInt    comm_max;   /* space at comment (only when reading header) */
-#    int     hcrc;       /* true if there was or will be a header crc */
-#    int     done;       /* true when done reading gzip header (not used
-#                           when writing a gzip file) */
-#} gz_header;
+#     for more details on the meanings of these fields.
+# */
+# typedef struct gz_header_s {
+#     int     text;       /* true if compressed data believed to be text */
+#     uLong   time;       /* modification time */
+#     int     xflags;     /* extra flags (not used when writing a gzip file) */
+#     int     os;         /* operating system */
+#     Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+#     uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+#     uInt    extra_max;  /* space at extra (only when reading header) */
+#     Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+#     uInt    name_max;   /* space at name (only when reading header) */
+#     Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+#     uInt    comm_max;   /* space at comment (only when reading header) */
+#     int     hcrc;       /* true if there was or will be a header crc */
+#     int     done;       /* true when done reading gzip header (not used
+#                            when writing a gzip file) */
+# } gz_header;
 
 Bytefp = ctypes.POINTER(ctypes.c_ubyte)
 
@@ -84,24 +84,24 @@
     ]
 
 
-#/* Structure for decoding tables.  Each entry provides either the
-#   information needed to do the operation requested by the code that
-#   indexed that table entry, or it provides a pointer to another
-#   table that indexes more bits of the code.  op indicates whether
-#   the entry is a pointer to another table, a literal, a length or
-#   distance, an end-of-block, or an invalid code.  For a table
-#   pointer, the low four bits of op is the number of index bits of
-#   that table.  For a length or distance, the low four bits of op
-#   is the number of extra bits to get after the code.  bits is
-#   the number of bits in this code or part of the code to drop off
-#   of the bit buffer.  val is the actual byte to output in the case
-#   of a literal, the base length or distance, or the offset from
-#   the current table to the next table.  Each entry is four bytes. */
-#typedef struct {
-#    unsigned char op;           /* operation, extra bits, table bits */
-#    unsigned char bits;         /* bits in this part of the code */
-#    unsigned short val;         /* offset in table or code value */
-#} code;
+# /* Structure for decoding tables.  Each entry provides either the
+#    information needed to do the operation requested by the code that
+#    indexed that table entry, or it provides a pointer to another
+#    table that indexes more bits of the code.  op indicates whether
+#    the entry is a pointer to another table, a literal, a length or
+#    distance, an end-of-block, or an invalid code.  For a table
+#    pointer, the low four bits of op is the number of index bits of
+#    that table.  For a length or distance, the low four bits of op
+#    is the number of extra bits to get after the code.  bits is
+#    the number of bits in this code or part of the code to drop off
+#    of the bit buffer.  val is the actual byte to output in the case
+#    of a literal, the base length or distance, or the offset from
+#    the current table to the next table.  Each entry is four bytes. */
+# typedef struct {
+#     unsigned char op;           /* operation, extra bits, table bits */
+#     unsigned char bits;         /* bits in this part of the code */
+#     unsigned short val;         /* offset in table or code value */
+# } code;
 
 class Code(ctypes.Structure):
     """code structure."""
@@ -112,46 +112,47 @@
         ('val', ctypes.c_ushort),
     ]
 
-#/* state maintained between inflate() calls.  Approximately 7K bytes. */
-#struct inflate_state {
-#    inflate_mode mode;          /* current inflate mode */
-#    int last;                   /* true if processing last block */
-#    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
-#    int havedict;               /* true if dictionary provided */
-#    int flags;                  /* gzip header method and flags (0 if zlib) */
-#    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT)*/
-#    unsigned long check;        /* protected copy of check value */
-#    unsigned long total;        /* protected copy of output count */
-#    gz_headerp head;            /* where to save gzip header information */
-#        /* sliding window */
-#    unsigned wbits;             /* log base 2 of requested window size */
-#    unsigned wsize;             /* window size or zero if not using window */
-#    unsigned whave;             /* valid bytes in the window */
-#    unsigned write;             /* window write index */
-#    unsigned char FAR *window;  /* allocated sliding window, if needed */
-#        /* bit accumulator */
-#    unsigned long hold;         /* input bit accumulator */
-#    unsigned bits;              /* number of bits in "in" */
-#        /* for string and stored block copying */
-#    unsigned length;            /* literal or length of data to copy */
-#    unsigned offset;            /* distance back to copy string from */
-#        /* for table and code decoding */
-#    unsigned extra;             /* extra bits needed */
-#        /* fixed and dynamic code tables */
-#    code const FAR *lencode;    /* starting table for length/literal codes */
-#    code const FAR *distcode;   /* starting table for distance codes */
-#    unsigned lenbits;           /* index bits for lencode */
-#    unsigned distbits;          /* index bits for distcode */
-#        /* dynamic table building */
-#    unsigned ncode;             /* number of code length code lengths */
-#    unsigned nlen;              /* number of length code lengths */
-#    unsigned ndist;             /* number of distance code lengths */
-#    unsigned have;              /* number of code lengths in lens[] */
-#    code FAR *next;             /* next available space in codes[] */
-#    unsigned short lens[320];   /* temporary storage for code lengths */
-#    unsigned short work[288];   /* work area for code table building */
-#    code codes[ENOUGH];         /* space for code tables */
-#};
+# /* state maintained between inflate() calls.  Approximately 7K bytes. */
+# struct inflate_state {
+#     inflate_mode mode;         /* current inflate mode */
+#     int last;                  /* true if processing last block */
+#     int wrap;                  /* bit 0 true for zlib, bit 1 true for gzip */
+#     int havedict;              /* true if dictionary provided */
+#     int flags;                 /* gzip header method and flags (0 if zlib) */
+#     unsigned dmax;             /* zlib header max distance (INFLATE_STRICT)*/
+#     unsigned long check;       /* protected copy of check value */
+#     unsigned long total;       /* protected copy of output count */
+#     gz_headerp head;           /* where to save gzip header information */
+#         /* sliding window */
+#     unsigned wbits;            /* log base 2 of requested window size */
+#     unsigned wsize;            /* window size or zero if not using window */
+#     unsigned whave;            /* valid bytes in the window */
+#     unsigned write;            /* window write index */
+#     unsigned char FAR *window; /* allocated sliding window, if needed */
+#         /* bit accumulator */
+#     unsigned long hold;        /* input bit accumulator */
+#     unsigned bits;             /* number of bits in "in" */
+#         /* for string and stored block copying */
+#     unsigned length;           /* literal or length of data to copy */
+#     unsigned offset;           /* distance back to copy string from */
+#         /* for table and code decoding */
+#     unsigned extra;            /* extra bits needed */
+#         /* fixed and dynamic code tables */
+#     code const FAR *lencode;   /* starting table for length/literal codes */
+#     code const FAR *distcode;  /* starting table for distance codes */
+#     unsigned lenbits;          /* index bits for lencode */
+#     unsigned distbits;         /* index bits for distcode */
+#         /* dynamic table building */
+#     unsigned ncode;            /* number of code length code lengths */
+#     unsigned nlen;             /* number of length code lengths */
+#     unsigned ndist;            /* number of distance code lengths */
+#     unsigned have;             /* number of code lengths in lens[] */
+#     code FAR *next;            /* next available space in codes[] */
+#     unsigned short lens[320];  /* temporary storage for code lengths */
+#     unsigned short work[288];  /* work area for code table building */
+#     code codes[ENOUGH];        /* space for code tables */
+# };
+
 if zlib.ZLIB_VERSION == '1.2.3.4':
     extra_fields = [
         ('sane', ctypes.c_int),
@@ -216,15 +217,15 @@
         # head will be always a NULL pointer, as we use raw in/delfate
         state = {}
         # first get the pointers offsets
-        #lencode = ctypes.string_at(self.lencode, ctypes.sizeof(Code))
+        # lencode = ctypes.string_at(self.lencode, ctypes.sizeof(Code))
         lencode_addr = ctypes.addressof(self.lencode.contents)
         codes_start = ctypes.addressof(self.codes)
         lencode = lencode_addr - codes_start
 
-        #distcode = ctypes.string_at(self.distcode, ctypes.sizeof(Code))
+        # distcode = ctypes.string_at(self.distcode, ctypes.sizeof(Code))
         distcode = ctypes.addressof(self.distcode.contents) - codes_start
 
-        #next = ctypes.string_at(self.next, ctypes.sizeof(Code))
+        # next = ctypes.string_at(self.next, ctypes.sizeof(Code))
         next = ctypes.addressof(self.next.contents) - codes_start
 
         # now get the raw memory data

=== renamed file 'lib/ubuntuone/storage/tests/test_rhashlib.py' => 'src/server/tests/test_rhashlib.py'
--- lib/ubuntuone/storage/tests/test_rhashlib.py	2015-08-05 13:10:02 +0000
+++ src/server/tests/test_rhashlib.py	2015-09-05 01:20:53 +0000
@@ -21,7 +21,7 @@
 import hashlib
 import unittest
 
-from ubuntuone.storage import rhashlib
+from ubuntuone.storage.server import rhashlib
 from ubuntuone.storageprotocol.content_hash import magic_hash_factory
 
 

=== renamed file 'lib/ubuntuone/storage/tests/test_rzlib.py' => 'src/server/tests/test_rzlib.py'
--- lib/ubuntuone/storage/tests/test_rzlib.py	2015-08-05 13:10:02 +0000
+++ src/server/tests/test_rzlib.py	2015-09-05 01:20:53 +0000
@@ -23,7 +23,7 @@
 import zlib
 import unittest
 
-from ubuntuone.storage import rzlib
+from ubuntuone.storage.server import rzlib
 
 
 class TestRZlib(unittest.TestCase):
@@ -233,7 +233,7 @@
             inflated_data += do.decompress(deflated_data[part:part * 2])
             self.assertRaises(zlib.error, do.decompress, data[part * 2:])
 
-    ##### stdlib zlib tests #####
+    # stdlib zlib tests #
 
     def test_decompressobj_badflush(self):
         """Verify failure on calling decompressobj.flush with bad params."""
@@ -297,7 +297,7 @@
         bufs = []
         cb = combuf
         while cb:
-            #max_length = 1 + len(cb)//10
+            # max_length = 1 + len(cb)//10
             chunk = dco.decompress(cb, dcx)
             self.failIf(len(chunk) > dcx,
                         'chunk too big (%d>%d)' % (len(chunk), dcx))

=== modified file 'src/server/tests/test_upload.py'
--- src/server/tests/test_upload.py	2015-08-05 13:10:02 +0000
+++ src/server/tests/test_upload.py	2015-09-05 01:20:53 +0000
@@ -28,8 +28,7 @@
 from s3lib import producers, s3lib
 from s4 import s4
 
-from ubuntuone.storage import rhashlib, rzlib
-from ubuntuone.storage.server import upload, errors
+from ubuntuone.storage.server import errors, rhashlib, rzlib, upload
 from ubuntuone.storage.server.auth import DummyAuthProvider
 from ubuntuone.storage.server.testing import testcase
 from ubuntuone.storageprotocol.content_hash import (

=== modified file 'src/server/upload.py'
--- src/server/upload.py	2015-08-14 19:00:10 +0000
+++ src/server/upload.py	2015-09-05 01:20:53 +0000
@@ -42,8 +42,7 @@
     crc32,
     magic_hash_factory,
 )
-from ubuntuone.storage import rhashlib, rzlib
-from ubuntuone.storage.server import errors
+from ubuntuone.storage.server import errors, rhashlib, rzlib
 
 logger = logging.getLogger("storage.server.upload")
 

=== renamed directory 'lib/tests' => 'src/tests'
=== renamed directory 'lib/ubuntuone/txutils' => 'src/txutils'
=== renamed directory 'lib/utilities' => 'src/utilities'
=== modified file 'src/utilities/load_sample_data.py'
--- lib/utilities/load_sample_data.py	2015-08-05 13:10:02 +0000
+++ src/utilities/load_sample_data.py	2015-09-05 01:20:53 +0000
@@ -20,10 +20,6 @@
 Called by the namesake in the top level utilities/ directory.
 """
 
-import warnings
-#enjoy the silence
-warnings.simplefilter("ignore")
-
 from utilities.userutils import (
     add_auth_info_to_keyfile,
     delete_all_data,
@@ -48,7 +44,7 @@
 
 def main():
     """Preload the website with some data."""
-    #clear out existing data
+    # clear out existing data
     delete_all_data()
     for user_data in SAMPLE_USERS:
         username = user_data['username']