rhodecode-enterprise-ce Files · pkgs/patch-kombu-py-2-7-11.diff

migration: detach permissions defaults migration from current models....

migration: detach permissions defaults migration from current models. This was causing that latest code was used results in potential problems during migration. Now we use the bound migraiton code that always will perform the same exact migrations independent of the current code changes.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1544:cf0c0eb2

default

Download file

             patch-kombu-py-2-7-11.diff
        
                    15 lines
            
             | 543 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patch-kombu-py-2-7-11.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup kombu-1.5.1-orig/kombu/utils/__init__.py kombu-1.5.1/kombu/utils/__init__.py

      --- kombu-1.5.1-orig/kombu/utils/__init__.py	2016-03-09 15:11:34.000000000 +0100

      +++ kombu-1.5.1/kombu/utils/__init__.py	2016-03-09 15:15:52.000000000 +0100

      @@ -11,7 +11,10 @@ Internal utilities.

       import sys

       from time import sleep

      -from uuid import UUID, uuid4 as _uuid4, _uuid_generate_random

      +from uuid import UUID, uuid4 as _uuid4

      +

      +# Fix for Python 2.7.11

      +_uuid_generate_random = None

       from kombu.utils.encoding import safe_repr as _safe_repr

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff -rup kombu-1.5.1-orig/kombu/utils/__init__.py kombu-1.5.1/kombu/utils/__init__.py
				--- kombu-1.5.1-orig/kombu/utils/__init__.py 2016-03-09 15:11:34.000000000 +0100
				+++ kombu-1.5.1/kombu/utils/__init__.py 2016-03-09 15:15:52.000000000 +0100
				@@ -11,7 +11,10 @@ Internal utilities.
				import sys

				from time import sleep
				-from uuid import UUID, uuid4 as _uuid4, _uuid_generate_random
				+from uuid import UUID, uuid4 as _uuid4
				+
				+# Fix for Python 2.7.11
				+_uuid_generate_random = None

				from kombu.utils.encoding import safe_repr as _safe_repr