Merge remote-tracking branch 'origin/development' into development

libs/subliminal_patch/providers/assrt.py

@@ -126,12 +126,14 @@ class AssrtProvider(Provider):
         keywords = []
         if isinstance(video, Movie):
             if video.title:
-                keywords.append(video.title)
+                title = "".join(e for e in video.title if e.isascii())
+                keywords.append(title)
             if video.year:
                 keywords.append(str(video.year))
         elif isinstance(video, Episode):
             if video.series:
-                keywords.append(video.series)
+                series = "".join(e for e in video.series if e.isascii())
+                keywords.append(series)
             if video.season and video.episode:
                 keywords.append('S%02dE%02d' % (video.season, video.episode))
             elif video.episode:

libs2/osdefs.h

@@ -1,48 +0,0 @@
-// from CPython
-#ifndef Py_OSDEFS_H
-#define Py_OSDEFS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Operating system dependencies */
-
-#ifdef MS_WINDOWS
-#define SEP L'\\'
-#define ALTSEP L'/'
-#define MAXPATHLEN 256
-#define DELIM L';'
-#endif
-
-/* Filename separator */
-#ifndef SEP
-#define SEP L'/'
-#endif
-
-/* Max pathname length */
-#ifdef __hpux
-#include <sys/param.h>
-#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-#endif
-
-#ifndef MAXPATHLEN
-#if defined(PATH_MAX) && PATH_MAX > 1024
-#define MAXPATHLEN PATH_MAX
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
-
-/* Search path entry delimiter */
-#ifndef DELIM
-#define DELIM L':'
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSDEFS_H */

libs2/winreparse.h

@@ -1,53 +0,0 @@
-#ifndef Py_WINREPARSE_H
-#define Py_WINREPARSE_H
-
-#ifdef MS_WINDOWS
-#include <Windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The following structure was copied from
-   http://msdn.microsoft.com/en-us/library/ff552012.aspx as the required
-   include doesn't seem to be present in the Windows SDK (at least as included
-   with Visual Studio Express). */
-typedef struct _REPARSE_DATA_BUFFER {
-    ULONG ReparseTag;
-    USHORT ReparseDataLength;
-    USHORT Reserved;
-    union {
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT SubstituteNameLength;
-            USHORT PrintNameOffset;
-            USHORT PrintNameLength;
-            ULONG Flags;
-            WCHAR PathBuffer[1];
-        } SymbolicLinkReparseBuffer;
-
-        struct {
-            USHORT SubstituteNameOffset;
-            USHORT  SubstituteNameLength;
-            USHORT  PrintNameOffset;
-            USHORT  PrintNameLength;
-            WCHAR  PathBuffer[1];
-        } MountPointReparseBuffer;
-
-        struct {
-            UCHAR  DataBuffer[1];
-        } GenericReparseBuffer;
-    };
-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
-
-#define REPARSE_DATA_BUFFER_HEADER_SIZE  FIELD_OFFSET(REPARSE_DATA_BUFFER,\
-                                                      GenericReparseBuffer)
-#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE  ( 16 * 1024 )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MS_WINDOWS */
-
-#endif /* !Py_WINREPARSE_H */